From 3f334adb489580f34db568739a8adc0bde509221 Mon Sep 17 00:00:00 2001 From: Dariusz Rup Date: Wed, 8 Jan 2025 10:55:54 +0100 Subject: [PATCH] OP-558 - update blacklist plugin to sylus 2 - edit composer.json and delete exclude in build.yml and codding_standard.yml --- .github/workflows/build.yml | 6 ------ .github/workflows/coding_standard.yml | 7 ------- .gitignore | 1 + composer.json | 2 +- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 43b7265..00c71d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,12 +26,6 @@ jobs: sylius: [ "~v2.0.0-alpha.2" ] node: [ "20.x" ] mysql: ["8.0"] - exclude: - - sylius: "~1.13.0" - php: "8.0" - - sylius: "~1.12.0" - php: "8.0" - symfony: "^6.4" env: APP_ENV: test diff --git a/.github/workflows/coding_standard.yml b/.github/workflows/coding_standard.yml index 9066cde..01099a7 100644 --- a/.github/workflows/coding_standard.yml +++ b/.github/workflows/coding_standard.yml @@ -23,13 +23,6 @@ jobs: sylius: [ "~v2.0.0-alpha.2" ] node: [ "20.x" ] - exclude: - - sylius: ^1.13 - php: 8.0 - - sylius: ^1.12 - php: 8.0 - symfony: ^6.4 - steps: - uses: actions/checkout@v3 diff --git a/.gitignore b/.gitignore index f486a1f..b4756ad 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /behat.yml /phpspec.yml /phpunit.xml +.idea diff --git a/composer.json b/composer.json index da6c92a..60b5579 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ "doctrine/annotations": "^2.0.0", "sylius-labs/polyfill-symfony-security": "^1.1", "sylius/calendar": "^0.5.0", - "sylius/grid-bundle": "^1.13.0-ALPHA.3", + "sylius/grid-bundle": "^1.13.0", "sylius/sylius": "^2.0.0-alpha.2", "sylius/twig-hooks": "^0.3.0", "symfony/stimulus-bundle": "^2.20",