Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions .github/workflows/browser-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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)"
Expand All @@ -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)"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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 }}
18 changes: 9 additions & 9 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,8 @@
"branch-alias": {
"dev-main": "4.6.x-dev"
}
},
"config": {
"allow-plugins": false
}
}
Loading