From bf2386885cb5ec15d7e0fd6935a45fc83ac93a2b Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 13:33:25 +0200 Subject: [PATCH 1/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 053d446..45a6e30 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -190,6 +190,7 @@ jobs: - name: Generate token id: generate_token uses: actions/create-github-app-token@v2 + if: ${{ !contains(steps.project-version.outputs.version, '3.3') }} with: app-id: ${{ secrets.AUTOMATION_CLIENT_ID }} private-key: ${{ secrets.AUTOMATION_CLIENT_SECRET }} @@ -203,13 +204,21 @@ jobs: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - - if: steps.generate_token.outputs.token != '' - name: Add composer key for GitHub App + - name: Add composer key for GitHub App + if: ${{ !contains(steps.project-version.outputs.version, '3.3') && steps.generate_token.outputs.token != '' }} run: | composer config github-oauth.github.com $GITHUB_TOKEN env: GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} + # For 3.3 versions + - name: Add composer key for GitHub App (3.3) + if: ${{ contains(steps.project-version.outputs.version, '3.3') }} + run: | + composer config github-oauth.github.com $GITHUB_TOKEN + env: + GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} + - if: startsWith(steps.project-version.outputs.version, 'v') == false name: Set up whole project using the tested dependency (dev version) run: | From af03ce6eefe14b1aba7fe4ef72afda213abf014f Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 15:05:06 +0200 Subject: [PATCH 2/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 45a6e30..b82b1a6 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -190,11 +190,10 @@ jobs: - name: Generate token id: generate_token uses: actions/create-github-app-token@v2 - if: ${{ !contains(steps.project-version.outputs.version, '3.3') }} with: app-id: ${{ secrets.AUTOMATION_CLIENT_ID }} private-key: ${{ secrets.AUTOMATION_CLIENT_SECRET }} - owner: ${{ github.repository_owner }} + owner: ${{ !contains(steps.project-version.outputs.version, '3.3') && 'ibexa' || 'ezsystems' }} - if: env.SATIS_NETWORK_KEY != '' name: Add composer keys for private packagist @@ -205,20 +204,12 @@ jobs: SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - name: Add composer key for GitHub App - if: ${{ !contains(steps.project-version.outputs.version, '3.3') && steps.generate_token.outputs.token != '' }} + if: ${{ steps.generate_token.outputs.token != '' }} run: | composer config github-oauth.github.com $GITHUB_TOKEN env: GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} - # For 3.3 versions - - name: Add composer key for GitHub App (3.3) - if: ${{ contains(steps.project-version.outputs.version, '3.3') }} - run: | - composer config github-oauth.github.com $GITHUB_TOKEN - env: - GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} - - if: startsWith(steps.project-version.outputs.version, 'v') == false name: Set up whole project using the tested dependency (dev version) run: | From e7ef51852ca03eb6045de094cd136b18768f5729 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 18:44:09 +0200 Subject: [PATCH 3/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 38 ++++++++++------------------- 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index b82b1a6..c1435ab 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -63,31 +63,6 @@ on: description: "Job maximum timeout in minutes" required: false type: number - secrets: - SLACK_WEBHOOK_URL: - required: true - SATIS_NETWORK_KEY: - required: false - SATIS_NETWORK_TOKEN: - required: false - TRAVIS_GITHUB_TOKEN: - required: false - AUTOMATION_CLIENT_ID: - required: false - AUTOMATION_CLIENT_INSTALLATION: - required: false - AUTOMATION_CLIENT_SECRET: - required: false - PERCY_TOKEN: - required: false - CLOUDINARY_URL: - required: false - LAMBDATEST_PROJECT_TOKEN: - required: false - LAMBDATEST_USERNAME: - required: false - LAMBDATEST_ACCESS_KEY: - required: false env: APP_ENV: behat @@ -203,6 +178,19 @@ jobs: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} + - name: Setup SSH key for 3.3 + if: ${{ contains(steps.project-version.outputs.version, '3.3') }} + run: | + set -eu + mkdir -p ~/.ssh && chmod 700 ~/.ssh + printf '%s\n' "${{ secrets.EZROBOT_SSH }}" > ~/.ssh/ezrobot + chmod 600 ~/.ssh/ezrobot + # known_hosts for github.com + ssh-keyscan -H github.com >> ~/.ssh/known_hosts + eval "$(ssh-agent -s)" + ssh-add ~/.ssh/ezrobot + echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> "$GITHUB_ENV" + - name: Add composer key for GitHub App if: ${{ steps.generate_token.outputs.token != '' }} run: | From 6e459adde89bad97ab1ca3213a67797cf6e76ce4 Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 20:17:01 +0200 Subject: [PATCH 4/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index c1435ab..040be1c 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -190,6 +190,7 @@ jobs: eval "$(ssh-agent -s)" ssh-add ~/.ssh/ezrobot echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> "$GITHUB_ENV" + composer config --global github-protocols ssh https - name: Add composer key for GitHub App if: ${{ steps.generate_token.outputs.token != '' }} From a635a3a0e19b3871ce1474f41cf8abaaccb1ad5e Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Thu, 9 Oct 2025 21:04:34 +0200 Subject: [PATCH 5/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 040be1c..0aad441 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -191,6 +191,8 @@ jobs: ssh-add ~/.ssh/ezrobot echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> "$GITHUB_ENV" composer config --global github-protocols ssh https + git config --global url."git@github.com:".insteadOf "https://github.com/" + git config --global url."git@github.com:".insteadOf "http://github.com/" - name: Add composer key for GitHub App if: ${{ steps.generate_token.outputs.token != '' }} From b1eb5c71ea6a6aa176259bf8420df376096fb94c Mon Sep 17 00:00:00 2001 From: Petro Kurbatskyi <67897517+ibexa-yuna@users.noreply.github.com> Date: Fri, 10 Oct 2025 09:51:56 +0200 Subject: [PATCH 6/6] Update browser-tests.yml --- .github/workflows/browser-tests.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 0aad441..e4facc1 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -178,28 +178,12 @@ jobs: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} - - name: Setup SSH key for 3.3 - if: ${{ contains(steps.project-version.outputs.version, '3.3') }} - run: | - set -eu - mkdir -p ~/.ssh && chmod 700 ~/.ssh - printf '%s\n' "${{ secrets.EZROBOT_SSH }}" > ~/.ssh/ezrobot - chmod 600 ~/.ssh/ezrobot - # known_hosts for github.com - ssh-keyscan -H github.com >> ~/.ssh/known_hosts - eval "$(ssh-agent -s)" - ssh-add ~/.ssh/ezrobot - echo "SSH_AUTH_SOCK=$SSH_AUTH_SOCK" >> "$GITHUB_ENV" - composer config --global github-protocols ssh https - git config --global url."git@github.com:".insteadOf "https://github.com/" - git config --global url."git@github.com:".insteadOf "http://github.com/" - - name: Add composer key for GitHub App if: ${{ steps.generate_token.outputs.token != '' }} run: | composer config github-oauth.github.com $GITHUB_TOKEN env: - GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }} + GITHUB_TOKEN: ${{ !contains(steps.project-version.outputs.version, '3.3') && steps.generate_token.outputs.token || secrets.EZROBOT_33 }} - if: startsWith(steps.project-version.outputs.version, 'v') == false name: Set up whole project using the tested dependency (dev version)