Skip to content

Commit dbffb1d

Browse files
committed
Several small changes to GHA.
1 parent 4844256 commit dbffb1d

File tree

7 files changed

+11
-13
lines changed

7 files changed

+11
-13
lines changed

.github/workflows/dockerfile.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ on:
3232
# Allow manually triggering the workflow.
3333
workflow_dispatch:
3434

35+
# Cancels all previous workflow runs for the same branch that have not yet completed.
3536
concurrency:
3637
group: ${{ github.workflow }}-${{ github.ref }}
3738
cancel-in-progress: true
@@ -52,3 +53,4 @@ jobs:
5253
args: >-
5354
hadolint
5455
--config .config/hadolint.yml
56+
Dockerfile

.github/workflows/json.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
# Allow manually triggering the workflow.
1919
workflow_dispatch:
2020

21+
# Cancels all previous workflow runs for the same branch that have not yet completed.
2122
concurrency:
2223
group: ${{ github.workflow }}-${{ github.ref }}
2324
cancel-in-progress: true

.github/workflows/markdown.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
# Allow manually triggering the workflow.
1919
workflow_dispatch:
2020

21+
# Cancels all previous workflow runs for the same branch that have not yet completed.
2122
concurrency:
2223
group: ${{ github.workflow }}-${{ github.ref }}
2324
cancel-in-progress: true

.github/workflows/php.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,8 @@ on:
2525
- 'composer.lock'
2626
# Allow manually triggering the workflow.
2727
workflow_dispatch:
28-
# Run once the "JSON Quality Assistance" workflow has been completed.
29-
workflow_run:
30-
workflows: [ "JSON Quality Assistance" ]
31-
types:
32-
- completed
3328

29+
# Cancels all previous workflow runs for the same branch that have not yet completed.
3430
concurrency:
3531
group: ${{ github.workflow }}-${{ github.ref }}
3632
cancel-in-progress: true
@@ -66,9 +62,9 @@ jobs:
6662
--no-plugins
6763
--no-scripts
6864
--strict
65+
working-directory: "solid"
6966
# 02.test.php.test-unit.yml
7067
php-unittest:
71-
continue-on-error: ${{ matrix.php < '8.1' || matrix.php > '8.4' }}
7268
name: PHP Unit Tests
7369
needs:
7470
- lint-php-syntax
@@ -82,8 +78,6 @@ jobs:
8278
- '8.1' # from 2021-11 to 2023-11 (2025-12)
8379
- '8.2' # from 2022-12 to 2024-12 (2026-12)
8480
- '8.3' # from 2023-11 to 2025-12 (2027-12)
85-
- '8.4' # from 2024-11 to 2026-12 (2028-12)
86-
- '8.5' # from 2025-11 to 2027-12 (2029-12)
8781
steps:
8882
- uses: actions/checkout@v4
8983
- uses: shivammathur/setup-php@v2
@@ -113,19 +107,19 @@ jobs:
113107
--no-dev
114108
--no-plugins
115109
--no-scripts
110+
working-directory: "solid"
116111
# 03.quality.php.lint-quality.yml
117112
php-lint-quality:
118113
needs:
119114
- lint-php-syntax
120115
runs-on: ubuntu-24.04
121116
steps:
122117
- uses: actions/checkout@v4
123-
- uses: pipeline-components/php-codesniffer@main
118+
- uses: docker://pipeline-components/php-codesniffer
124119
with:
125120
options: --standard=.config/phpcs.xml.dist
126121
# 03.quality.php.lint-version-compatibility.yml
127122
php-check-version-compatibility:
128-
continue-on-error: ${{ matrix.php < '8.1' || matrix.php > '8.4' }}
129123
name: PHP Version Compatibility
130124
needs:
131125
- lint-php-syntax
@@ -138,8 +132,6 @@ jobs:
138132
- '8.1' # from 2021-11 to 2023-11 (2025-12)
139133
- '8.2' # from 2022-12 to 2024-12 (2026-12)
140134
- '8.3' # from 2023-11 to 2025-12 (2027-12)
141-
- '8.4' # from 2024-11 to 2026-12 (2028-12)
142-
- '8.5' # from 2025-11 to 2027-12 (2029-12)
143135
steps:
144136
- uses: actions/checkout@v4
145137
- uses: docker://pipelinecomponents/php-codesniffer

.github/workflows/shell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
name: Shell Script Quality Assistance
33

4-
54
on:
65
# This event occurs when there is activity on a pull request. The workflow
76
# will be run against the commits, after merge to the target branch (main).
@@ -21,6 +20,7 @@ on:
2120
# Allow manually triggering the workflow.
2221
workflow_dispatch:
2322

23+
# Cancels all previous workflow runs for the same branch that have not yet completed.
2424
concurrency:
2525
group: ${{ github.workflow }}-${{ github.ref }}
2626
cancel-in-progress: true

.github/workflows/xml.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ on:
2020
# Allow manually triggering the workflow.
2121
workflow_dispatch:
2222

23+
# Cancels all previous workflow runs for the same branch that have not yet completed.
2324
concurrency:
2425
group: ${{ github.workflow }}-${{ github.ref }}
2526
cancel-in-progress: true

.github/workflows/yaml.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
# Allow manually triggering the workflow.
1919
workflow_dispatch:
2020

21+
# Cancels all previous workflow runs for the same branch that have not yet completed.
2122
concurrency:
2223
group: ${{ github.workflow }}-${{ github.ref }}
2324
cancel-in-progress: true

0 commit comments

Comments
 (0)