Merge branch 'master' into feature/add-retry

synolia · Dec 20, 2023 · f7b8ec9 · f7b8ec9
2 parents 0353706 + b65f412
commit f7b8ec9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/.github/workflows/analysis.yaml b/.github/workflows/analysis.yaml
@@ -3,7 +3,6 @@ name: Analysis
     push:
         branches:
             - master
-            - develop
         paths-ignore:
             - README.md
     pull_request:
@@ -17,7 +16,6 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - 8.0
                     - 8.2
                 symfony:
                     - '5.4.*'
@@ -66,10 +64,6 @@ jobs:
                 name: 'PHPStan - Run'
                 run: 'if [ -f ruleset/phpstan.neon ]; then vendor/bin/phpstan analyse -c ruleset/phpstan.neon src/ ; else echo PHPStan ruleset file does not exist, skipping step ; fi'
                 if: 'always() && steps.end-of-setup.outcome == ''success'''
-            -
-                name: 'PHPSpec - Run'
-                run: 'if [ -f phpspec.yml.dist ]; then vendor/bin/phpspec run ; else echo PHPSpec config file does not exist, skipping step ; fi'
-                if: 'always() && steps.end-of-setup.outcome == ''success'''
             -
                 name: 'PHPMD - Run'
                 run: 'if [ -f ruleset/.php_md.xml ]; then vendor/bin/phpmd src ansi ruleset/.php_md.xml ; else echo PHPMD config file does not exist, skipping step ; fi'
@@ -79,5 +73,6 @@ jobs:
                 run: 'if [ -f grumphp.yml ]; then vendor/bin/grumphp run ; else echo Grumphp ruleset file does not exist, skipping step ; fi'
                 if: 'always() && steps.end-of-setup.outcome == ''success'''
             -
-                uses: symfonycorp/security-checker-action@v5
+                uses: symfonycorp/security-checker-action@v3
                 if: 'always() && steps.end-of-setup.outcome == ''success'''
+                continue-on-error: true
diff --git a/.github/workflows/sylius.yaml b/.github/workflows/sylius.yaml
@@ -17,23 +17,14 @@ jobs:
             fail-fast: false
             matrix:
                 php:
-                    - 8.0
                     - 8.2
                 sylius:
-                    - 1.10.0
                     - 1.12.0
                 symfony:
                     - 5.4
                     - 6.2
                 node:
                     - 14.x
-                exclude:
-                    -
-                        sylius: 1.10.0
-                        symfony: 6.2
-                    -
-                        php: '8.0'
-                        symfony: 6.2
         env:
             APP_ENV: test
             package-name: synolia/sylius-akeneo-plugin