Skip to content

Commit e106a50

Browse files
yoanmyoanm
authored
Harmonize CI & files (#112)
1 parent c439c17 commit e106a50

14 files changed

+139
-128
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/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 & 5 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
@@ -33,8 +30,8 @@ jobs:
3330
contents: read
3431
uses: ./.github/workflows/reusable-CI-workflow.yml
3532

36-
upload:
37-
name: Upload
33+
coverage:
34+
name: Coverage
3835
needs: [tests]
3936
permissions:
4037
contents: read

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

Lines changed: 7 additions & 6 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 }}'
@@ -225,9 +226,9 @@ jobs:
225226
needs: [ fetch-supported-versions, tests ]
226227
if: ${{ github.event_name == 'push' || ( github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'with-nightly-tests') ) }}
227228
runs-on: ubuntu-latest
228-
continue-on-error: true
229229
permissions:
230230
contents: read
231+
continue-on-error: true
231232
env:
232233
COMPOSER_IGNORE_PLATFORM_REQ: 'php+'
233234
strategy:
@@ -249,7 +250,7 @@ jobs:
249250
symfony-version: ${{ needs.fetch-supported-versions.outputs.symfony-next }}
250251
# Fix - behat/gherkin => Avoid issue with behat <-> gherkin packages (See https://github.com/Behat/Gherkin/issues/317)
251252
# 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-max == '8.4' ) && 'symfony/framework-bundle:~7.0.0@dev' || '' }}
253+
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' || '' }}
253254
- job-name: Symfony - With lowest supported PHP version
254255
# Fix - Sf 7.0 require php 8.1 minimum, most of deps require 8.2 !
255256
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 }}

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

Lines changed: 4 additions & 2 deletions
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
@@ -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 }}

‎.remarkrc‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"plugins": [
33
"remark-preset-lint-consistent",
4-
"remark-preset-lint-recommended"
4+
"remark-preset-lint-recommended",
5+
[
6+
"remark-lint-list-item-indent",
7+
"space"
8+
]
59
]
610
}

‎.scrutinizer.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ build:
4141
variables:
4242
CI: 'true'
4343
TEST_OUTPUT_STYLE: 'pretty'
44-
COMPOSER_OPTIONS: '--optimize-autoloader'
4544
COVERAGE_OUTPUT_STYLE: 'clover'
4645
COVERAGE_CLOVER_FILE_PATH: 'build/coverage/clover.xml'
4746
PHPCS_DISABLE_WARNING: 'true'

‎CHANGELOG-3.1.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,32 @@
44

55
### PHP Versions
66

7-
* 🗑️ Drop PHP 7.2 support
7+
* 🗑️ Drop PHP 7.2 support
88

9-
* ✔️ PHP 7.3
9+
* ✔️ PHP 7.3
1010

11-
* ✔️ PHP 7.4
11+
* ✔️ PHP 7.4
1212

13-
* 🚀 Add PHP 8.0
13+
* 🚀 Add PHP 8.0
1414

15-
* 🚀 Add PHP 8.1
15+
* 🚀 Add PHP 8.1
1616

17-
* 🧪 Set PHP 8.2 for nightly
17+
* 🧪 Set PHP 8.2 for nightly
1818

1919
### Symfony Versions
2020

21-
* ✔️ Symfony 4.4
21+
* ✔️ Symfony 4.4
2222

23-
* ✔️ Symfony 5.4
23+
* ✔️ Symfony 5.4
2424

25-
* 🧪 Set Symfony 6.0 for nightly
25+
* 🧪 Set Symfony 6.0 for nightly
2626

2727
### Chore
2828

29-
* ✏️ Add EditorConfig files
29+
* ✏️ Add EditorConfig files
3030

31-
* :octocat: Move CI from Travis to Github Action
31+
* :octocat: Move CI from Travis to Github Action
3232

33-
* 📊 Configure CodeCov
33+
* 📊 Configure CodeCov
3434

35-
* 🔬 Configure Codacy
35+
* 🔬 Configure Codacy

‎CODE_OF_CONDUCT.md‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@ appearance, race, religion, or sexual identity and orientation.
1414
Examples of behavior that contributes to creating a positive environment
1515
include:
1616

17-
* Using welcoming and inclusive language
18-
* Being respectful of differing viewpoints and experiences
19-
* Gracefully accepting constructive criticism
20-
* Focusing on what is best for the community
21-
* Showing empathy towards other community members
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
2222

2323
Examples of unacceptable behavior by participants include:
2424

25-
* The use of sexualized language or imagery and unwelcome sexual attention or
26-
advances
27-
* Trolling, insulting/derogatory comments, and personal or political attacks
28-
* Public or private harassment
29-
* Publishing others' private information, such as a physical or electronic
30-
address, without explicit permission
31-
* Other conduct which could reasonably be considered inappropriate in a
32-
professional setting
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
3333

3434
## Our Responsibilities
3535

0 commit comments

Comments
 (0)