Skip to content

Commit e0e68ec

Browse files
committed
Harmonize CI
1 parent d52d1e3 commit e0e68ec

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
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/coverage-upload.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
checks: write # For the check run creation !
1010

1111
jobs:
12-
upload:
12+
coverage:
1313
name: Coverage
1414
permissions:
1515
contents: read

.github/workflows/pre-check-CI-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
contents: read
3131
uses: ./.github/workflows/reusable-CI-workflow.yml
3232

33-
upload:
33+
coverage:
3434
name: Coverage
3535
needs: [tests]
3636
permissions:

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,23 @@ jobs:
6060
- job-name: Up to date versions # => Highest versions allowed by composer config
6161
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6262
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
63-
## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
63+
# 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
6565
- job-name: Up to date versions - Special case - Symfony 5.4
6666
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'
6767
symfony-version: '5.4'
68-
## Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
68+
# 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 }}'
@@ -217,9 +218,9 @@ jobs:
217218
needs: [ fetch-supported-versions, tests ]
218219
if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
219220
runs-on: ubuntu-latest
220-
continue-on-error: true
221221
permissions:
222222
contents: read
223+
continue-on-error: true
223224
env:
224225
COMPOSER_IGNORE_PLATFORM_REQ: 'php+'
225226
strategy:

0 commit comments

Comments
 (0)