Skip to content

Commit 0afc0f2

Browse files
authored
Merge pull request #64 from jrfnl/feature/ghactions-various-updates
GHActions: various updates
2 parents 0452bd3 + 0fc6b62 commit 0afc0f2

File tree

2 files changed

+24
-9
lines changed

2 files changed

+24
-9
lines changed

.github/workflows/check-cs.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ on:
1010
# Allow manually triggering the workflow.
1111
workflow_dispatch:
1212

13+
# Cancels all previous workflow runs for the same branch that have not yet completed.
14+
concurrency:
15+
# The concurrency group contains the workflow name and the branch name.
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
1319
jobs:
1420
fix-style:
1521
name: Fix Code Style
@@ -31,7 +37,7 @@ jobs:
3137

3238
- name: Install dependencies
3339
run: |
34-
composer update --prefer-dist --no-suggest --no-progress
40+
composer update --prefer-dist --no-suggest --no-progress --no-interaction
3541
3642
- name: Check Code Style
3743
run: vendor/bin/phpcs --report-full --report-checkstyle=./phpcs-report.xml

.github/workflows/run-tests.yml

+17-8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ on:
1010
# Allow manually triggering the workflow.
1111
workflow_dispatch:
1212

13+
# Cancels all previous workflow runs for the same branch that have not yet completed.
14+
concurrency:
15+
# The concurrency group contains the workflow name and the branch name.
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: true
18+
1319
jobs:
1420
php-tests:
1521
runs-on: ubuntu-latest
@@ -19,7 +25,7 @@ jobs:
1925

2026
strategy:
2127
matrix:
22-
php: ['8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4']
28+
php: ['8.1', '8.0', '7.4', '7.3', '7.2', '7.1', '7.0', '5.6', '5.5', '5.4']
2329
dependency-version: ['prefer-stable']
2430
experimental: [false]
2531

@@ -33,8 +39,11 @@ jobs:
3339
- php: '8.0'
3440
dependency-version: 'prefer-lowest'
3541
experimental: false
36-
3742
- php: '8.1'
43+
dependency-version: 'prefer-lowest'
44+
experimental: false
45+
46+
- php: '8.2'
3847
dependency-version: 'prefer-stable'
3948
experimental: true
4049

@@ -56,21 +65,21 @@ jobs:
5665
# Remove the coding standards package as it has a higher minimum PHP
5766
# requirement and would prevent running the tests on older PHP versions.
5867
- name: 'Composer: remove CS dependency'
59-
run: composer remove --dev --no-update dms/coding-standard
68+
run: composer remove --dev --no-update dms/coding-standard --no-interaction
6069

6170
- name: 'Composer: update PHPUnit for testing lowest'
6271
if: ${{ matrix.dependency-version == 'prefer-lowest' }}
63-
run: composer require --no-update phpunit/phpunit:"^9.0"
72+
run: composer require --no-update phpunit/phpunit:"^9.0" --no-interaction
6473

6574
- name: Install dependencies - normal
66-
if: ${{ matrix.php < 8.1 }}
75+
if: ${{ matrix.php < 8.2 }}
6776
run: |
68-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
77+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction
6978
7079
- name: Install dependencies - ignore platform reqs
71-
if: ${{ matrix.php >= 8.1 }}
80+
if: ${{ matrix.php >= 8.2 }}
7281
run: |
73-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs
82+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs --no-interaction
7483
7584
- name: Execute Unit Tests
7685
run: vendor/bin/phpunit

0 commit comments

Comments
 (0)