Skip to content

Commit 6f90a55

Browse files
committed
Harmonize CI
1 parent 4e0bd9e commit 6f90a55

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ permissions:
99
checks: write # For the check run creation !
1010

1111
jobs:
12-
upload:
13-
name: Upload
12+
coverage:
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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
contents: read
3131
uses: ./.github/workflows/reusable-CI-workflow.yml
3232

33-
upload:
34-
name: Upload
33+
coverage:
34+
name: Coverage
3535
needs: [tests]
3636
permissions:
3737
contents: read

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ 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
pkg-extra-constraints: behat/gherkin:~4.12.0
7070
- job-name: Bare minimum # => Lowest versions allowed by composer config
7171
php-version: '${{ needs.fetch-supported-versions.outputs.php-min }}'
@@ -223,9 +223,9 @@ jobs:
223223
needs: [ fetch-supported-versions, tests ]
224224
if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
225225
runs-on: ubuntu-latest
226-
continue-on-error: true
227226
permissions:
228227
contents: read
228+
continue-on-error: true
229229
env:
230230
COMPOSER_IGNORE_PLATFORM_REQ: 'php+'
231231
strategy:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ jobs:
3232
outputs:
3333
commit-sha: ${{ steps.fetch-workflow-metadata.outputs.commit-sha }}
3434
run-id: ${{ steps.fetch-workflow-metadata.outputs.run-id }}
35+
branch: ${{ steps.fetch-workflow-metadata.outputs.branch }}
36+
pull-request: ${{ steps.fetch-workflow-metadata.outputs.pull-request }}
3537

3638
codacy-uploader:
3739
name: Codacy
@@ -64,6 +66,6 @@ jobs:
6466
run-id: ${{ needs.fetch-info.outputs.run-id }}
6567
force-git-commit: ${{ needs.fetch-info.outputs.commit-sha }}
6668
force-git-branch: ${{ needs.fetch-info.outputs.branch }}
67-
force-gh-pr: ${{ needs.fetch-info.outputs.pr-number }}
69+
force-gh-pr: ${{ needs.fetch-info.outputs.pull-request }}
6870
force-uploader-build: ${{ needs.fetch-info.outputs.run-id }}
6971
force-uploader-build-url: ${{ needs.fetch-info.outputs.run-url }}

0 commit comments

Comments
 (0)