From cb206f67220b31a683709aac79643dc10bb19219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 1 Oct 2025 14:04:42 +0200 Subject: [PATCH 1/3] [CI][3.3 back-port] Align secrets for browser tests --- .github/workflows/browser-tests.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 93efe9a1c7..0399563919 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -35,6 +35,9 @@ jobs: timeout: 60 secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} regression-oss-setup2: name: "PHP 7.4/Node 16/MySQL" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -51,6 +54,9 @@ jobs: timeout: 60 secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} regression-oss-setup3: name: "PHP 8.3/Node 18/MySQL" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -65,3 +71,6 @@ jobs: timeout: 60 secrets: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} + AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} + AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} + AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} From f658a4c0be19c9231bffb17e7907222be8f3f9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 10 Oct 2025 11:48:00 +0200 Subject: [PATCH 2/3] secrest inherit --- .github/workflows/browser-tests.yml | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 0399563919..9f7e4a3225 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-oss-setup1: name: "PHP 7.3/Node 14/PostgreSQL/Varnish/Redis" - 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: "oss" project-version: ${{ github.event.inputs.project-version }} @@ -33,14 +33,10 @@ jobs: php-image: "ghcr.io/ibexa/docker/php:7.3-node14" job-count: 2 timeout: 60 - secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + secrets: inherit regression-oss-setup2: name: "PHP 7.4/Node 16/MySQL" - 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: "oss" project-version: ${{ github.event.inputs.project-version }} @@ -52,14 +48,10 @@ jobs: php-image: "ghcr.io/ibexa/docker/php:7.4-node16" job-count: 2 timeout: 60 - secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + secrets: inherit regression-oss-setup3: name: "PHP 8.3/Node 18/MySQL" - 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: "oss" project-version: ${{ github.event.inputs.project-version }} @@ -69,8 +61,4 @@ jobs: send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 2 timeout: 60 - secrets: - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }} - AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} - AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} + secrets: inherit From 59e99baf6112c5b53af3aa0f5fed856094a10397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Fri, 10 Oct 2025 13:45:17 +0200 Subject: [PATCH 3/3] 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 9f7e4a3225..653dcdbb65 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-oss-setup1: name: "PHP 7.3/Node 14/PostgreSQL/Varnish/Redis" - 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: "oss" project-version: ${{ github.event.inputs.project-version }} @@ -36,7 +36,7 @@ jobs: secrets: inherit regression-oss-setup2: name: "PHP 7.4/Node 16/MySQL" - 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: "oss" project-version: ${{ github.event.inputs.project-version }} @@ -51,7 +51,7 @@ jobs: secrets: inherit regression-oss-setup3: name: "PHP 8.3/Node 18/MySQL" - 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: "oss" project-version: ${{ github.event.inputs.project-version }}