From 045d91d8317bf4c075c2d988090b2dbe4507d3e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 1 Oct 2025 15:42:00 +0200 Subject: [PATCH 1/7] [CI][3.3 back-port] Align secrets for browser tests --- .github/workflows/browser-tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 873cf8f7..4a670abe 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -37,7 +37,9 @@ jobs: secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" @@ -57,7 +59,9 @@ jobs: secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" @@ -77,5 +81,7 @@ jobs: secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} From 5c64e17aeb6fd25ab734398c68d70a705a09e527 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:09:04 +0200 Subject: [PATCH 2/7] Switch to inherited secrets --- .github/workflows/browser-tests.yml | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 4a670abe..0f8643ee 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -34,13 +34,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.3-node14" timeout: 120 - secrets: - SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} - SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + secrets: inherit regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -56,13 +50,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node16" timeout: 120 - secrets: - SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} - SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + secrets: inherit regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -78,10 +66,4 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.3-node18" timeout: 120 - secrets: - SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} - SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + secrets: inherit From 88337f3275c864f8111d6e5aec5d2e3115f2aa0d Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:33:45 +0200 Subject: [PATCH 3/7] Update browser-tests.yml --- .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 0f8643ee..56bf7cbb 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-commerce-setup1: name: "PHP 7.3/Node 14/PostgreSQL/Varnish/Redis/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} From 5143e68eb6b9e82033f9e53f7c8d1d27ab1567da Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:37:24 +0200 Subject: [PATCH 4/7] Update browser-tests.yml --- .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 56bf7cbb..8f69295c 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -37,7 +37,7 @@ jobs: secrets: inherit regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -53,7 +53,7 @@ jobs: secrets: inherit regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} From 35237f259de4bf20415f70150caa1f12d4fdefb8 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 19:09:47 +0200 Subject: [PATCH 5/7] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 8f69295c..3c795004 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -34,6 +34,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.3-node14" timeout: 120 + ci-scripts-branch: 3.3-secrets secrets: inherit regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" @@ -50,6 +51,7 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node16" timeout: 120 + ci-scripts-branch: 3.3-secrets secrets: inherit regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" @@ -66,4 +68,5 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.3-node18" timeout: 120 + ci-scripts-branch: 3.3-secrets secrets: inherit From a8b11f0e41df18dccec22ba260af688bb6401e42 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Fri, 10 Oct 2025 09:52:14 +0200 Subject: [PATCH 6/7] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 3c795004..8f69295c 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -34,7 +34,6 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.3-node14" timeout: 120 - ci-scripts-branch: 3.3-secrets secrets: inherit regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" @@ -51,7 +50,6 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node16" timeout: 120 - ci-scripts-branch: 3.3-secrets secrets: inherit regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" @@ -68,5 +66,4 @@ jobs: multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.3-node18" timeout: 120 - ci-scripts-branch: 3.3-secrets secrets: inherit From 42aa84dbef476065e20a4f2c1234d4ce31b28529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 10 Oct 2025 13:52:15 +0200 Subject: [PATCH 7/7] revert tmp gh-wf branch --- .github/workflows/browser-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 8f69295c..0f8643ee 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-commerce-setup1: name: "PHP 7.3/Node 14/PostgreSQL/Varnish/Redis/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -37,7 +37,7 @@ jobs: secrets: inherit regression-commerce-setup2: name: "PHP 7.4/Node 16/MySQL/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -53,7 +53,7 @@ jobs: secrets: inherit regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@3.3-secrets + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }}