From 5001d4ad6f5a72402a05d704cedc0ec8a28e9522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 4 Dec 2023 13:14:05 +0100 Subject: [PATCH 1/5] [Composer] Added conflict with lexik/jwt-authentication-bundle 2.20.0 and 2.20.1 (#126) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 5ba49ac880..48b841e645 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "doctrine/persistence": "3.0.0", "gregwar/captcha-bundle": "2.2.0", "imagine/imagine": "1.3.0 || 1.3.1", - "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0", + "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0 || 2.20.0 || 2.20.1", "symfony/dependency-injection": "5.3.7 || 5.4.17", "symfony/framework-bundle": "5.3.14 || 5.4.3", "symfony/expression-language": "5.4.7", From 1ef8faea4ec4274afd2ede30c11bc745d604bac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 4 Dec 2023 13:29:02 +0100 Subject: [PATCH 2/5] Revert "[Composer] Added conflict with lexik/jwt-authentication-bundle 2.20.0 and 2.20.1 (#126)" This reverts commit 5001d4ad6f5a72402a05d704cedc0ec8a28e9522. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f5bef6bba6..89f275c9dc 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "doctrine/persistence": "3.0.0", "gregwar/captcha-bundle": "2.2.0", "imagine/imagine": "1.3.0 || 1.3.1", - "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0 || 2.20.0 || 2.20.1", + "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0", "symfony/dependency-injection": "5.3.7 || 5.4.17", "symfony/framework-bundle": "5.3.14 || 5.4.3", "symfony/expression-language": "5.4.7", From 77945d8d877d4b2b799347597ba6024d50dcbb53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Wed, 6 Dec 2023 12:02:10 +0100 Subject: [PATCH 3/5] [Composer] Added conflict with lexik/jwt-authentication-bundle 2.20.2 (#127) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 48b841e645..2d052069d6 100644 --- a/composer.json +++ b/composer.json @@ -69,7 +69,7 @@ "doctrine/persistence": "3.0.0", "gregwar/captcha-bundle": "2.2.0", "imagine/imagine": "1.3.0 || 1.3.1", - "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0 || 2.20.0 || 2.20.1", + "lexik/jwt-authentication-bundle": "2.12.0 || 2.18.0 || 2.20.0 || 2.20.1 || 2.20.2", "symfony/dependency-injection": "5.3.7 || 5.4.17", "symfony/framework-bundle": "5.3.14 || 5.4.3", "symfony/expression-language": "5.4.7", From 517194561d6948def1217f30088a68bdb5a6d434 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 21 Dec 2023 13:14:57 +0100 Subject: [PATCH 4/5] [CI] IBX-4515: Include tests running on PHP 8.2 (#129) --- .github/workflows/browser-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 218b5be7bd..d7430a45f3 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -52,14 +52,14 @@ jobs: secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-oss-setup3: - name: "PHP 8.1/MySQL" + name: "PHP 8.2/MySQL" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "oss" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=oss" test-setup-phase-1: "--profile=regression --suite=setup-oss --mode=standard" - php-image: "ghcr.io/ibexa/docker/php:8.1-node18" + php-image: "ghcr.io/ibexa/docker/php:8.2-node18" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 2 timeout: 60 From ec69a9879555cf385faa3123fd2a9f8cca946cfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 21 Dec 2023 13:37:36 +0100 Subject: [PATCH 5/5] [CI] IBX-4515: Fix typo in PHP 8.2 job name --- .github/workflows/browser-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 9fceec83bb..27928ff2a2 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -59,7 +59,7 @@ jobs: AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} regression-oss-setup3: - name: "PHP 8.1/Node 18/MySQL" + name: "PHP 8.2/Node 18/MySQL" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "oss"