Skip to content

Commit 96fd5ea

Browse files
authored
Merge branch 'master' into feature/50-prevent-warnings-on-phpunit-50
2 parents e0f7d25 + 0afc0f2 commit 96fd5ea

File tree

3 files changed

+26
-11
lines changed

3 files changed

+26
-11
lines changed

.github/workflows/check-cs.yml

+8-2
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
@@ -20,7 +26,7 @@ jobs:
2026

2127
steps:
2228
- name: Checkout code
23-
uses: actions/checkout@v2.3.4
29+
uses: actions/checkout@v2.4.0
2430

2531
- name: Setup PHP
2632
uses: shivammathur/setup-php@v2
@@ -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/promote-tag.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2.3.4
13+
uses: actions/checkout@v2.4.0
1414
with:
1515
ref: ${{ github.ref }}
1616
- name: Pick Release Version from git tag

.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

@@ -36,8 +42,11 @@ jobs:
3642
- php: '8.0'
3743
dependency-version: 'prefer-lowest'
3844
experimental: false
39-
4045
- php: '8.1'
46+
dependency-version: 'prefer-lowest'
47+
experimental: false
48+
49+
- php: '8.2'
4150
dependency-version: 'prefer-stable'
4251
experimental: true
4352

@@ -46,7 +55,7 @@ jobs:
4655

4756
steps:
4857
- name: Checkout code
49-
uses: actions/checkout@v2.3.4
58+
uses: actions/checkout@v2.4.0
5059

5160
- name: Setup PHP
5261
uses: shivammathur/setup-php@v2
@@ -59,7 +68,7 @@ jobs:
5968
# Remove the coding standards package as it has a higher minimum PHP
6069
# requirement and would prevent running the tests on older PHP versions.
6170
- name: 'Composer: remove CS dependency'
62-
run: composer remove --dev --no-update dms/coding-standard
71+
run: composer remove --dev --no-update dms/coding-standard --no-interaction
6372

6473
- name: 'Composer: update PHPUnit for testing lowest (PHP 7.2)'
6574
if: ${{ matrix.dependency-version == 'prefer-lowest' && matrix.php == '7.2' }}
@@ -70,14 +79,14 @@ jobs:
7079
run: composer require --no-update phpunit/phpunit:"^9.0" --no-interaction
7180

7281
- name: Install dependencies - normal
73-
if: ${{ matrix.php < 8.1 }}
82+
if: ${{ matrix.php < 8.2 }}
7483
run: |
75-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
84+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction
7685
7786
- name: Install dependencies - ignore platform reqs
78-
if: ${{ matrix.php >= 8.1 }}
87+
if: ${{ matrix.php >= 8.2 }}
7988
run: |
80-
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs
89+
composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --ignore-platform-reqs --no-interaction
8190
8291
- name: Execute Unit Tests
8392
run: vendor/bin/phpunit

0 commit comments

Comments
 (0)