Skip to content

Commit 99884c8

Browse files
committed
Harmonize CI
1 parent c439c17 commit 99884c8

File tree

6 files changed

+13
-14
lines changed

6 files changed

+13
-14
lines changed

.github/workflows/CI.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,8 @@ on: # Build any PRs and main branch changes
1010
# In case of updates to those workflows, they must be pre-checked by `pre-check-CI-updates.yml` rather than this workflow !
1111
# Any updates on those workflows are expected to be restricted to those workflows only ! (no update on code for instance)
1212
- '.github/workflows/pre-check-CI-updates.yml'
13-
- '.github/workflows/CI.yml'
14-
- '.github/workflows/coverage-upload.yml'
1513
- '.github/workflows/reusable-CI-workflow.yml'
1614
- '.github/workflows/reusable-coverage-upload-workflow.yml'
17-
- '.github/workflows/auto-merge-dependabot.yml'
1815
push:
1916
branches: [ master ]
2017
schedule:
@@ -29,7 +26,6 @@ concurrency:
2926

3027
env:
3128
TEST_OUTPUT_STYLE: pretty
32-
COMPOSER_OPTIONS: --optimize-autoloader
3329

3430
jobs:
3531
tests:

.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/[email protected]
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
@@ -10,7 +10,7 @@ permissions:
1010

1111
jobs:
1212
upload:
13-
name: Upload
13+
name: Coverage
1414
permissions:
1515
contents: read
1616
checks: write # For the check run creation !

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ on:
1212
branches: [master] # Only for PR targeting master branch
1313
paths: # /!\ Duplicate the same list as `on.pull_request.paths-ignore` property value for CI workflow !
1414
- '.github/workflows/pre-check-CI-updates.yml' # This workflow
15-
- '.github/workflows/CI.yml'
16-
- '.github/workflows/coverage-upload.yml'
1715
- '.github/workflows/reusable-CI-workflow.yml'
1816
- '.github/workflows/reusable-coverage-upload-workflow.yml'
19-
- '.github/workflows/auto-merge-dependabot.yml'
2017

2118
permissions:
2219
contents: read

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@ 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)
69-
# 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
68+
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
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 }}'
7473
- job-name: Bare minimum - Special case - Symfony 5.4
7574
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
7675
symfony-version: '5.4'
7776
- 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 !
77+
# Fix - Sf 6.4 require php 8.1 minimum !
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 }}
7979
symfony-version: '${{ needs.fetch-supported-versions.outputs.symfony-max }}'
8080
- job-name: Late migration - Symfony # => Lowest symfony version with highest php version allowed by composer config
8181
php-version: '${{ needs.fetch-supported-versions.outputs.php-max }}'

.github/workflows/reusable-coverage-upload-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: 'Check run ○'
2424
uses: yoanm/temp-reports-group-workspace/utils/attach-check-run-to-triggering-workflow@v0
2525
with:
26-
name: 'Fetch coverage info'
26+
name: 'Fetch triggering workflow metadata'
2727
fails-on-triggering-workflow-failure: true
2828

2929
- uses: yoanm/temp-reports-group-workspace/utils/fetch-workflow-metadata@v0

0 commit comments

Comments
 (0)