Skip to content

Commit 5e842a9

Browse files
authored
Increase CI supported versions (#30)
1 parent 2d7ce35 commit 5e842a9

File tree

4 files changed

+18
-9
lines changed

4 files changed

+18
-9
lines changed

.github/workflows/auto-merge-dependabot.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@ jobs:
1818
uses: dependabot/fetch-metadata@v2.4.0
1919
with:
2020
github-token: "${{ secrets.GITHUB_TOKEN }}"
21+
22+
- name: Add custom labels
23+
run: gh pr edit "${{github.event.pull_request.html_url}}" --add-label "with-nightly-tests"
24+
env:
25+
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
26+
2127
- name: Enable auto-merge for Dependabot PRs
2228
if: ${{ steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch'}}
2329
run: gh pr merge --auto --squash "$PR_URL"

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,16 @@ jobs:
6767
symfony-version: '5.4'
6868
## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
6969
# Fix - symfony/yaml - Avoid issue with Sf YAML 6.4+ and Framework bundle
70-
pkg-extra-constraints: behat/gherkin:~4.12.0 symfony/yaml:~6.4.0
70+
pkg-extra-constraints: behat/gherkin:~4.12.0 ${{ ( needs.fetch-supported-versions.outputs.symfony-max == '6.4' ) && 'symfony/yaml:~6.4.0' || '' }}
7171
- job-name: Bare minimum # => Lowest versions allowed by composer config
7272
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7373
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-min }}'
7474
- job-name: Bare minimum - Special case - Symfony 5.4
7575
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7676
symfony-version: '5.4'
7777
- job-name: Late migration - PHP # => Highest symfony version with lowest php version allowed by composer config
78-
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 }} # Fix - Sf 6.4 require php 8.1 minimum !
78+
# 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 }}
7980
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
8081
- job-name: Late migration - Symfony # => Lowest symfony version with highest php version allowed by composer config
8182
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
@@ -244,13 +245,15 @@ jobs:
244245
php-version: ${{ needs.fetch-supported-versions.outputs.php-max }}
245246
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
246247
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
247-
pkg-extra-constraints: behat/gherkin:~4.12.0
248+
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
249+
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' || '' }}
248250
- job-name: Symfony - With lowest supported PHP version
249251
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
250-
php-version: ${{ ( needs.fetch-supported-versions.outputs.symfony-next == '6.3' && needs.fetch-supported-versions.outputs.php-min == '8.0' ) && '8.1' || needs.fetch-supported-versions.outputs.php-min }}
252+
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 }}
251253
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
254+
# Fix - symfony/framework-bundle - Framework bundle <7.0 require php 8.1 minimum !
252255
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
253-
pkg-extra-constraints: behat/gherkin:~4.12.0
256+
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' || '' }}
254257

255258
steps:
256259
- name: Check out code
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"php": {"min": "8.0", "max": "8.2", "next": "8.3"},
3-
"symfony": {"min": "4.4", "max": "6.0", "next": "6.3"}
2+
"php": {"min": "8.0", "max": "8.4", "next": "8.5"},
3+
"symfony": {"min": "4.4", "max": "6.4", "next": "7.0"}
44
}

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"ext-json": "*",
4444
"behat/behat": "^3.9.0,<=3.16.1",
4545
"dvdoug/behat-code-coverage": "^5.0",
46-
"matthiasnoback/symfony-config-test": "^4.0",
47-
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
46+
"matthiasnoback/symfony-config-test": "^4.0 || ^5.0",
47+
"matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
4848
"phpspec/prophecy": "^1.15",
4949
"phpspec/prophecy-phpunit": "^2.0",
5050
"phpunit/php-code-coverage": "^9.2.4",

0 commit comments

Comments
 (0)