Skip to content

Commit fbb5ce0

Browse files
authored
Merge pull request #685 from PHPCSStandards/feature/ghactions-minor-tweaks
GH Actions: minor further tweaks
2 parents 0e1bf78 + ab93977 commit fbb5ce0

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.github/workflows/quicktest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
- name: Setup ini config
5454
id: set_ini
5555
run: |
56-
if [ "${{ matrix.phpcs_version }}" == "lowest" ]; then
56+
if [ "${{ contains( matrix.phpcs_version, 'dev') }}" == "false" ]; then
5757
echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> "$GITHUB_OUTPUT"
5858
else
5959
echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"

.github/workflows/test.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ jobs:
9898
phpcs_version: '4.x-dev'
9999
- php: '7.1'
100100
phpcs_version: '4.x-dev'
101+
# Also exclude the 7.2 build as that's run in code coverage, no need to duplicate.
102+
- php: '7.2'
103+
phpcs_version: '4.x-dev'
101104

102105
include:
103106
- php: '5.6'
@@ -116,6 +119,10 @@ jobs:
116119
phpcs_version: 'dev-master'
117120
risky: false
118121
experimental: true
122+
- php: '8.5'
123+
phpcs_version: '4.x-dev'
124+
risky: false
125+
experimental: true
119126

120127
# Run risky tests separately.
121128
- php: '5.4'
@@ -161,7 +168,7 @@ jobs:
161168
- name: Setup ini config
162169
id: set_ini
163170
run: |
164-
if [[ "${{ matrix.phpcs_version }}" != "dev-master" && "${{ matrix.phpcs_version }}" != "4.x-dev" ]]; then
171+
if [ "${{ contains( matrix.phpcs_version, 'dev') }}" == "false" ]; then
165172
echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> "$GITHUB_OUTPUT"
166173
else
167174
echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"
@@ -294,7 +301,7 @@ jobs:
294301
- name: Setup ini config
295302
id: set_ini
296303
run: |
297-
if [[ "${{ matrix.phpcs_version }}" != "dev-master" && "${{ matrix.phpcs_version }}" != "4.x-dev" ]]; then
304+
if [ "${{ contains( matrix.phpcs_version, 'dev') }}" == "false" ]; then
298305
echo 'PHP_INI=error_reporting=E_ALL & ~E_DEPRECATED, display_errors=On' >> "$GITHUB_OUTPUT"
299306
else
300307
echo 'PHP_INI=error_reporting=-1, display_errors=On' >> "$GITHUB_OUTPUT"

0 commit comments

Comments
 (0)