From e49cbba34070a460cbf7c8c57cc8ad95a99428e5 Mon Sep 17 00:00:00 2001 From: konradoboza Date: Mon, 6 Oct 2025 15:54:14 +0200 Subject: [PATCH] [CI] Aligned secrets --- .github/workflows/browser-tests.yaml | 21 +++++++++++++++++++++ .github/workflows/ci.yaml | 18 +++++++++--------- composer.json | 3 +++ 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/.github/workflows/browser-tests.yaml b/.github/workflows/browser-tests.yaml index d4140d1..1a74054 100644 --- a/.github/workflows/browser-tests.yaml +++ b/.github/workflows/browser-tests.yaml @@ -17,6 +17,9 @@ jobs: test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-symfony-cache' test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish6: name: "Varnish 6 integration tests" @@ -27,6 +30,9 @@ jobs: test-suite: '--mode=standard --profile=httpCache --suite=varnish6' test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish7: name: "Varnish 7 integration tests" @@ -37,6 +43,9 @@ jobs: test-suite: '--mode=standard --profile=httpCache --suite=varnish7' test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish6-translation-aware: name: "Varnish integration tests (translation-aware)" @@ -48,6 +57,9 @@ jobs: test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-translation-aware' test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish7-translation-aware: name: "Varnish 7 integration tests (translation-aware)" @@ -59,6 +71,9 @@ jobs: test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-translation-aware' test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish6-token: name: "Varnish 6 integration tests with invalidate token" @@ -70,6 +85,9 @@ jobs: test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-token' test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} varnish7-token: name: "Varnish 7 integration tests with invalidate token" @@ -81,4 +99,7 @@ jobs: test-setup-phase-1: '--mode=standard --profile=httpCache --suite=setup-token' test-setup-phase-2: '--mode=standard --profile=httpCache --suite=setup' secrets: + 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 }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d7c9b25..8dd9c22 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,7 +16,7 @@ jobs: php: - '8.1' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -26,9 +26,9 @@ jobs: extensions: 'pdo_sqlite, gd' tools: cs2pr - - uses: "ramsey/composer-install@v1" + - uses: ramsey/composer-install@v3 with: - dependency-versions: "highest" + dependency-versions: highest - name: Run code style check run: composer run-script check-cs -- --format=checkstyle | cs2pr @@ -42,7 +42,7 @@ jobs: - '7.4' - '8.3' steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -52,9 +52,9 @@ jobs: extensions: 'pdo_sqlite, gd' tools: cs2pr - - uses: "ramsey/composer-install@v3" + - uses: ramsey/composer-install@v3 with: - dependency-versions: "highest" + dependency-versions: highest - name: Run PHPStan analysis run: composer run-script phpstan @@ -76,7 +76,7 @@ jobs: composer_options: "--ignore-platform-req php" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v5 - name: Setup PHP Action uses: shivammathur/setup-php@v2 @@ -86,9 +86,9 @@ jobs: extensions: pdo_sqlite, gd tools: cs2pr - - uses: "ramsey/composer-install@v1" + - uses: ramsey/composer-install@v3 with: - dependency-versions: "highest" + dependency-versions: highest composer-options: "${{ matrix.composer_options }}" - name: Setup problem matchers for PHPUnit diff --git a/composer.json b/composer.json index 1296d61..610e7bd 100644 --- a/composer.json +++ b/composer.json @@ -72,5 +72,8 @@ "branch-alias": { "dev-main": "4.6.x-dev" } + }, + "config": { + "allow-plugins": false } }