From f247b1fc691edef007fbbbb8a2ff7da987492d50 Mon Sep 17 00:00:00 2001 From: Windragon Date: Thu, 30 Dec 2021 17:13:21 +0100 Subject: [PATCH 1/7] [Maintenance] Run GitHub actions on PHP 8, Node 14 & Symfony 5.4 --- .github/workflows/build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3208688..de270c2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,15 +23,11 @@ jobs: strategy: fail-fast: false matrix: - php: ["7.4", "8.0"] - symfony: ["^4.4", "^5.2"] - node: ["10.x"] + php: ["8.0"] + symfony: ["^4.4", "^5.4"] + node: ["14.x"] mysql: ["5.7", "8.0"] - exclude: - - - php: "7.4" - mysql: "5.7" env: APP_ENV: test_cached DATABASE_URL: "mysql://root:root@127.0.0.1/sylius?serverVersion=${{ matrix.mysql }}" From fd05d1fc17c3e77e29b62415d6340c4c43739214 Mon Sep 17 00:00:00 2001 From: Windragon Date: Thu, 30 Dec 2021 17:14:54 +0100 Subject: [PATCH 2/7] [Config] Use doctrine transport as default for Symfony Messenger --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 00581e5..1aefb6b 100644 --- a/.env +++ b/.env @@ -25,7 +25,7 @@ MAILER_URL=smtp://localhost ###> symfony/messenger ### # Choose one of the transports below # MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages -# MESSENGER_TRANSPORT_DSN=doctrine://default +MESSENGER_TRANSPORT_DSN=doctrine://default # MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages ###< symfony/messenger ### From 9c1a633085976bd303e2ef486ed9c7b0326e5acd Mon Sep 17 00:00:00 2001 From: Windragon Date: Mon, 10 Jan 2022 17:16:03 +0100 Subject: [PATCH 3/7] [Config] Use sync transport for test env --- .env.test | 5 +++++ .env.test_cached | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/.env.test b/.env.test index 1e0cf76..0ce5931 100644 --- a/.env.test +++ b/.env.test @@ -7,3 +7,8 @@ JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST ###< lexik/jwt-authentication-bundle ### + +###> symfony/messenger ### +# Sync transport turned for testing env for the ease of testing +MESSENGER_TRANSPORT_DSN=sync:// +###< symfony/messenger ### diff --git a/.env.test_cached b/.env.test_cached index 7b3bae6..3964f31 100644 --- a/.env.test_cached +++ b/.env.test_cached @@ -8,3 +8,8 @@ JWT_SECRET_KEY=%kernel.project_dir%/config/jwt/private-test.pem JWT_PUBLIC_KEY=%kernel.project_dir%/config/jwt/public-test.pem JWT_PASSPHRASE=ALL_THAT_IS_GOLD_DOES_NOT_GLITTER_NOT_ALL_THOSE_WHO_WANDER_ARE_LOST ###< lexik/jwt-authentication-bundle ### + +###> symfony/messenger ### +# Sync transport turned for testing env for the ease of testing +MESSENGER_TRANSPORT_DSN=sync:// +###< symfony/messenger ### From 85ed402042b02315b31f8db1a0911bebb5a1b755 Mon Sep 17 00:00:00 2001 From: Windragon Date: Tue, 11 Jan 2022 15:58:58 +0100 Subject: [PATCH 4/7] [Maintenance] Temporary removal of schema validation due to changes in payum to support dbal v3 --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index de270c2..5e42d33 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -156,10 +156,6 @@ jobs: name: Run PHPStan run: vendor/bin/phpstan analyse -c phpstan.neon -l max src/ - - - name: Validate database schema - run: bin/console doctrine:schema:validate - - name: Run PHPSpec run: vendor/bin/phpspec run --ansi -f progress --no-interaction From ae31faa98983b7162ca33c95ba0621ce4106fdbb Mon Sep 17 00:00:00 2001 From: Windragon Date: Wed, 12 Jan 2022 16:21:34 +0100 Subject: [PATCH 5/7] [Maintenance] Remove whitespace in tag defintion --- .github/workflows/build.yml | 4 ++-- behat.yml.dist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e42d33..7d40b20 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -166,11 +166,11 @@ jobs: - name: Run non-JS Behat - run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript && ~@todo && ~@cli" + run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli" - name: Run JS Behat - run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript && ~@todo && ~@cli" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript && ~@todo && ~@cli" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript && ~@todo && ~@cli" --rerun + run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --rerun - name: Upload Behat logs diff --git a/behat.yml.dist b/behat.yml.dist index a9d28f3..ac89478 100644 --- a/behat.yml.dist +++ b/behat.yml.dist @@ -59,4 +59,4 @@ default: gherkin: filters: - tags: "~@todo && ~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors + tags: "~@todo&&~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors From 67c4a3abab23d3a4d23ac1ec22fe18209e7db684 Mon Sep 17 00:00:00 2001 From: Windragon Date: Thu, 13 Jan 2022 09:15:42 +0100 Subject: [PATCH 6/7] [Behat] Run managing catalog promotion scenarios in separation This change was the simplest scenario for single scecnario failing. This scenario was failing only in UI context(while working fine in API). The problem didn't exist when scenarios where run locally or just in separate step of GitHub Action. Instead of commiting more time for the investigation, I've decided to split the execution. --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7d40b20..cdd2f17 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -164,9 +164,13 @@ jobs: name: Run PHPUnit run: vendor/bin/phpunit --colors=always + - + name: Run managing catalog promotion scenarios + run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli&&@managing_catalog_promotions" + - - name: Run non-JS Behat - run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli" + name: Run non-JS Behat (without managing catalog promotion scenarios) + run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli&&@~managing_catalog_promotions" - name: Run JS Behat From b32ae9c5844c722ea7146645359144c1ba8633f6 Mon Sep 17 00:00:00 2001 From: Windragon Date: Thu, 13 Jan 2022 11:38:39 +0100 Subject: [PATCH 7/7] [Behat] Import web profiler test config into test cached Ref. https://github.com/Sylius/Sylius/pull/12990 --- config/packages/test_cached/web_profiler.yaml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 config/packages/test_cached/web_profiler.yaml diff --git a/config/packages/test_cached/web_profiler.yaml b/config/packages/test_cached/web_profiler.yaml new file mode 100644 index 0000000..9052e3a --- /dev/null +++ b/config/packages/test_cached/web_profiler.yaml @@ -0,0 +1,2 @@ +imports: + - { resource: "../test/web_profiler.yaml" }