Skip to content

Commit f1dae9f

Browse files
committed
Fix matrix testing
1 parent 50ec641 commit f1dae9f

2 files changed

Lines changed: 22 additions & 12 deletions

File tree

.github/workflows/continuous-integration.yml

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.event.pull_request.draft == false
1717
runs-on: ubuntu-latest
1818
env:
19-
SYMFONY_REQUIRE: ${{matrix.symfony-require}}
19+
SYMFONY_REQUIRE: ${{matrix.symfony_version}}
2020
SYMFONY_DEPRECATIONS_HELPER: "baselineFile=./tests/allowed-deprecations.json"
2121
strategy:
2222
fail-fast: false
@@ -28,34 +28,34 @@ jobs:
2828
- 8.4
2929
dependencies:
3030
- "highest"
31-
symfony-require:
31+
symfony_version:
3232
- ""
3333
include:
3434
# Test against latest Symfony 5.4
35-
- symfony-require: "5.4.*"
35+
- symfony_version: "5.4.*"
3636
php-version: "8.1"
3737
dependencies: "highest"
38-
- symfony-require: "5.4.*"
38+
- symfony_version: "5.4.*"
3939
php-version: "8.2"
4040
dependencies: "highest"
41-
- symfony-require: "5.4.*"
41+
- symfony_version: "5.4.*"
4242
php-version: "8.3"
4343
dependencies: "highest"
44-
- symfony-require: "5.4.*"
44+
- symfony_version: "5.4.*"
4545
php-version: "8.4"
4646
dependencies: "highest"
4747

4848
# Test against latest Symfony 6.4
49-
- symfony-require: "6.4.*"
49+
- symfony_version: "6.4.*"
5050
php-version: "8.1"
5151
dependencies: "highest"
52-
- symfony-require: "6.4.*"
52+
- symfony_version: "6.4.*"
5353
php-version: "8.2"
5454
dependencies: "highest"
55-
- symfony-require: "6.4.*"
55+
- symfony_version: "6.4.*"
5656
php-version: "8.3"
5757
dependencies: "highest"
58-
- symfony-require: "6.4.*"
58+
- symfony_version: "6.4.*"
5959
php-version: "8.4"
6060
dependencies: "highest"
6161

@@ -80,8 +80,18 @@ jobs:
8080
coverage: pcov
8181
ini-values: "zend.assertions=1"
8282

83+
- name: "symfony/flex is required to install the correct symfony version"
84+
if: ${{ matrix.symfony_version }}
85+
run: |
86+
composer global config --no-plugins allow-plugins.symfony/flex true
87+
composer global require symfony/flex
88+
89+
- name: "Configure Symfony version for symfony/flex"
90+
if: ${{ matrix.symfony_version }}
91+
run: composer config extra.symfony.require "${{ matrix.symfony_version }}.*"
92+
8393
- name: "Install dependencies with Composer"
84-
uses: "ramsey/composer-install@v2"
94+
uses: "ramsey/composer-install@v3"
8595
with:
8696
dependency-versions: "${{ matrix.dependencies }}"
8797

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"psalm/plugin-phpunit": "^0.19.2",
4040
"roave/security-advisories": "dev-latest",
4141
"twig/twig": "^2.0 || ^3.19",
42-
"vimeo/psalm": "^6.4.0"
42+
"vimeo/psalm": "^6.0.0"
4343
},
4444
"suggest": {
4545
"twig/twig": "Allow to use the cloudinary_url function/filter"

0 commit comments

Comments
 (0)