Skip to content

Commit 444fa3f

Browse files
authored
Merge pull request #609 from deguif/ci-configuration
Review CI configuration
2 parents 63f2be1 + d031c4d commit 444fa3f

File tree

2 files changed

+17
-19
lines changed

2 files changed

+17
-19
lines changed

.github/workflows/ci.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,13 @@ on:
99
branches:
1010
- "master"
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
14+
cancel-in-progress: true
15+
1216
jobs:
1317
phpunit:
14-
name: "PHPUnit"
18+
name: 'PHPUnit (PHP ${{ matrix.php-version }}, Symfony ${{ matrix.symfony-version }} + ${{ matrix.dependencies }} deps)'
1519
runs-on: "ubuntu-20.04"
1620

1721
strategy:
@@ -22,11 +26,11 @@ jobs:
2226
- '^6.4'
2327
- '^7.2'
2428
php-version:
25-
- "8.3"
26-
- "8.4"
29+
- '8.3'
30+
- '8.4'
2731
dependencies:
28-
- "lowest"
29-
- "highest"
32+
- 'lowest'
33+
- 'highest'
3034
steps:
3135
- name: "Checkout"
3236
uses: "actions/checkout@v2"
@@ -38,26 +42,22 @@ jobs:
3842
with:
3943
php-version: "${{ matrix.php-version }}"
4044
coverage: "pcov"
45+
tools: 'flex'
4146
ini-values: "zend.assertions=1"
4247

43-
- name: Remove sensio/framework-extra-bundle
44-
uses: php-actions/composer@v6
48+
- name: 'Remove sensio/framework-extra-bundle'
4549
if: matrix.symfony-version == '^7.2'
46-
with:
47-
command: remove
48-
args: --dev sensio/framework-extra-bundle --no-update
49-
50-
- name: Configure symfony version
51-
uses: php-actions/composer@v6
52-
with:
53-
command: config
54-
args: extra.symfony.require ${{ matrix.symfony-version }}
50+
run: |
51+
composer remove --dev --no-update sensio/framework-extra-bundle
5552
5653
- name: "Install dependencies with Composer"
5754
uses: "ramsey/composer-install@v3"
5855
with:
5956
dependency-versions: "${{ matrix.dependencies }}"
6057
composer-options: "${{ matrix.composer-options }}"
58+
env:
59+
COMPOSER_FUND: '0'
60+
SYMFONY_REQUIRE: '${{ matrix.symfony-version }}'
6161

6262
- name: Run tests
6363
run: |

composer.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@
4747
"symfony/security-csrf": "^5.4 || ^6.4 || ^7.1",
4848
"symfony/property-access": "^5.4 || ^6.4 || ^7.1",
4949
"symfony/routing": "^5.4 || ^6.4 || ^7.1",
50-
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.1",
51-
"symfony/flex": "^2.4"
50+
"symfony/twig-bundle": "^5.4 || ^6.4 || ^7.1"
5251
},
5352
"config": {
5453
"sort-packages": true,
5554
"allow-plugins": {
56-
"symfony/flex": true,
5755
"dealerdirect/phpcodesniffer-composer-installer": true
5856
}
5957
},

0 commit comments

Comments
 (0)