Skip to content

Commit 1099560

Browse files
committed
GH Actions/test: minor simplification [2]
* Improve step condition and reduce the need for bash scripting.
1 parent 034deb7 commit 1099560

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@ jobs:
235235
id: phpcs
236236
run: >
237237
php "bin/phpcs" --no-cache --parallel=1
238-
${{ matrix.custom_ini == false && matrix.php == '8.4' && '--report-full --report-checkstyle=./phpcs-report.xml' || '' }}
238+
${{ matrix.os == 'ubuntu-latest' && matrix.php == '8.4' && '--report-full --report-checkstyle=./phpcs-report.xml' || '' }}
239239
240240
- name: Show PHPCS results in PR
241-
if: ${{ always() && steps.phpcs.outcome == 'failure' && matrix.php == '8.4' }}
241+
if: ${{ always() && steps.phpcs.outcome == 'failure' && matrix.os == 'ubuntu-latest' && matrix.php == '8.4' }}
242242
run: cs2pr ./phpcs-report.xml
243243

244244
- name: Download the PHPCS phar
@@ -291,14 +291,11 @@ jobs:
291291
uses: actions/checkout@v4
292292

293293
- name: Setup ini config
294-
if: ${{ matrix.os != 'windows-latest' }}
294+
if: ${{ matrix.custom_ini == true && matrix.os != 'windows-latest' }}
295295
id: set_ini
296296
shell: bash
297297
run: |
298-
# Set the "short_open_tag" ini to make sure specific conditions are tested.
299-
if [[ ${{ matrix.custom_ini }} == true && "${{ matrix.php }}" == '7.2' ]]; then
300-
echo 'PHP_INI=, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
301-
fi
298+
echo 'PHP_INI=, date.timezone=Australia/Sydney, short_open_tag=On' >> "$GITHUB_OUTPUT"
302299
303300
- name: Install PHP
304301
uses: shivammathur/setup-php@v2

0 commit comments

Comments
 (0)