Skip to content

Commit 249a510

Browse files
yoanmyoanm
authored
Merge b887512 into f9d80a1 
2 parents f9d80a1 + b887512 commit 249a510

File tree

5 files changed

+35
-23
lines changed

5 files changed

+35
-23
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,23 @@ on: # Build any PRs and main branch changes
77
- opened
88
- synchronize
99
paths-ignore:
10+
# >>> CI Pre-check
1011
# In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow !
1112
# Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance)
1213
- '.github/workflows/pre-check-CI-updates.yml'
1314
- '.github/workflows/reusable-CI-workflow.yml'
1415
- '.github/workflows/reusable-coverage-upload-workflow.yml'
16+
# <<< CI Pre-check
17+
# >>> Irrelevant files (no impact whatsoever on this GHWorkflow)
18+
- '.github/workflows/coverage-upload.yml' # Executed for on master (workflow_run), no impact here
19+
- '.github/workflows/dependabot-PRs.yml' # Executed for dependabot PRs, no impact here
20+
- '**/*.md'
21+
- '**/LICENSE'
22+
- '**/CODEOWNERS'
23+
- '**/.remarkrc*'
24+
- '**/.editorconfig'
25+
- '**/.scrutinizer.yml'
26+
# <<< Irrelevant files
1527
push:
1628
branches: [ master ]
1729
schedule:

‎.github/workflows/auto-merge-dependabot.yml‎ renamed to ‎.github/workflows/dependabot-PRs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: PR auto-merge
1+
name: Dependabot PRs
22
on: pull_request
33

44
permissions:

‎.github/workflows/reusable-CI-workflow.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
dependency: symfony
4646

4747
tests:
48-
name: ${{ matrix.job-name }}
48+
name: PHP ${{ matrix.php-version }} & Sf ${{ matrix.symfony-version }} - ${{ matrix.job-name }}
4949
needs: [fetch-supported-versions]
5050
runs-on: ubuntu-latest
5151
permissions:
@@ -62,23 +62,23 @@ jobs:
6262
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
6363
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6464
pkg-extra-constraints: behat/gherkin:~4.12.0
65-
- job-name: Up to date versions - Special case - Symfony 5.4
65+
- job-name: Up to date versions - Sf 6.4 case
6666
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
67-
symfony-version: '5.4'
67+
symfony-version: '6.4'
6868
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
69-
# Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
70-
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
69+
pkg-extra-constraints: behat/gherkin:~4.12.0
7170
- job-name: Bare minimum # => Lowest versions allowed by composer config
7271
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7372
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
74-
- job-name: Bare minimum - Special case - Symfony 5.4
75-
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
76-
symfony-version: '5.4'
77-
- job-name: Late migration - PHP # => Highest symfony version with lowest php version allowed by composer config
73+
- job-name: Bare minimum - Sf 6.4 case
7874
# Fix - Sf 6.4 require php 8.1 minimum !
79-
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
75+
php-version: ${{ ( needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
76+
symfony-version: '6.4'
77+
- job-name: Late PHP migration # => Highest symfony version with lowest php version allowed by composer config
78+
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
79+
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
8080
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
81-
- job-name: Late migration - Symfony # => Lowest symfony version with highest php version allowed by composer config
81+
- job-name: Late Symfony migration # => Lowest symfony version with highest php version allowed by composer config
8282
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
8383
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
8484
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
@@ -214,7 +214,7 @@ jobs:
214214
uses: actions/dependency-review-action@v4
215215

216216
nightly-tests:
217-
name: Nightly - ${{ matrix.job-name }}
217+
name: Nightly - PHP ${{ matrix.php-version }} & Sf ${{ matrix.symfony-version }} - ${{ matrix.job-name }}
218218
needs: [ fetch-supported-versions, tests ]
219219
if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
220220
runs-on: ubuntu-latest
@@ -227,29 +227,29 @@ jobs:
227227
fail-fast: false
228228
matrix:
229229
include:
230-
- job-name: PHP - With highest supported Symfony versions
230+
- job-name: PHP with highest supported Symfony versions
231231
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
232232
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-max }}
233233
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
234234
pkg-extra-constraints: behat/gherkin:~4.12.0
235-
- job-name: PHP - With lowest supported Symfony versions
235+
- job-name: PHP with lowest supported Symfony versions
236236
php-version: ${{ needs.fetch-supported-versions.outputs.php-next }}
237237
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-min }}
238238
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
239239
pkg-extra-constraints: behat/gherkin:~4.12.0
240-
- job-name: Symfony - With highest supported PHP version
240+
- job-name: Symfony with highest supported PHP version
241241
php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
242242
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
243243
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
244244
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
245-
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-max == '8.4' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
246-
- job-name: Symfony - With lowest supported PHP version
247-
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
248-
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
245+
pkg-extra-constraints: behat/gherkin:~4.12.0
246+
- job-name: Symfony with lowest supported PHP version
247+
# Fix - symfony/validator 7.1 require php 8.2 minimum !
248+
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.1' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.2' || needs.fetch-supported-versions.outputs.php-min }}
249249
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
250250
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
251251
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
252-
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '7.0' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
252+
pkg-extra-constraints: behat/gherkin:~4.12.0
253253

254254
steps:
255255
- name: Check out code

‎.github/workflows/supported-versions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"php": {"min": "8.0", "max": "8.4", "next": "8.5"},
3-
"symfony": {"min": "4.4", "max": "6.4", "next": "7.0"}
3+
"symfony": {"min": "5.4", "max": "7.0", "next": "7.1"}
44
}

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"require": {
3434
"php": "^8.0",
35-
"symfony/validator": "^4.4 || ^5.4 || ^6.0",
35+
"symfony/validator": "^5.4 || ^6.4 || ^7.0",
3636
"yoanm/jsonrpc-server-sdk": "^3.0"
3737
},
3838
"require-dev": {

0 commit comments

Comments
 (0)