Skip to content

Commit b5920ce

Browse files
iMattProiMattPro
committed
Fix yaml
1 parent 29dbcea commit b5920ce

File tree

1 file changed

+27
-28
lines changed

1 file changed

+27
-28
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
DB: ${{ matrix.db }}
120120
PHP_VERSION: ${{ matrix.php }}
121121
NOTESTS: '1'
122-
run: .github/setup-phpbb.sh $DB $PHP_VERSION $NOTESTS
122+
run: .github/setup-phpbb.sh "$DB" "$PHP_VERSION" "$NOTESTS"
123123
working-directory: ./phpBB3
124124

125125
- name: Setup EPV
@@ -138,7 +138,7 @@ jobs:
138138
if: ${{ env.SNIFF != '0' }}
139139
env:
140140
NOTESTS: '1'
141-
run: .github/ext-sniff.sh $EXTNAME $NOTESTS
141+
run: .github/ext-sniff.sh "$EXTNAME" "$NOTESTS"
142142
working-directory: ./phpBB3
143143

144144
- name: Check image ICC profiles
@@ -148,7 +148,7 @@ jobs:
148148

149149
- name: Check executable files
150150
if: ${{ env.EXECUTABLE_FILES != '0' }}
151-
run: .github/ext-check-executable-files.sh ./ $EXTNAME
151+
run: .github/ext-check-executable-files.sh ./ "$EXTNAME"
152152
working-directory: ./phpBB3
153153

154154
- name: Run EPV
@@ -230,8 +230,8 @@ jobs:
230230
env:
231231
MATRIX_DB: ${{ matrix.db }}
232232
run: |
233-
db=$(echo "${MATRIX_DB%%:*}")
234-
echo "db=$db" >> $GITHUB_OUTPUT
233+
db="${MATRIX_DB%%:*}"
234+
echo "db=$db" >> "$GITHUB_OUTPUT"
235235
236236
- name: Setup PHP
237237
uses: shivammathur/setup-php@v2
@@ -245,14 +245,14 @@ jobs:
245245
DB: ${{steps.database-type.outputs.db}}
246246
PHP_VERSION: ${{ matrix.php }}
247247
NOTESTS: '0'
248-
run: .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
248+
run: .github/setup-phpbb.sh "$DB" "$PHP_VERSION" "${NOTESTS:-0}"
249249
working-directory: ./phpBB3
250250

251251
- name: Setup database
252252
env:
253253
DB: ${{steps.database-type.outputs.db}}
254254
MYISAM: ${{ matrix.MYISAM != 1 && '0' || '1' }}
255-
run: .github/setup-database.sh $DB $MYISAM
255+
run: .github/setup-database.sh "$DB" "$MYISAM"
256256
working-directory: ./phpBB3
257257

258258
- name: Set up Node.js
@@ -295,11 +295,10 @@ jobs:
295295
DB: ${{steps.database-type.outputs.db}}
296296
COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
297297
run: |
298-
if [ $COVERAGE == '1' ]
299-
then
300-
sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<filter>\n\t\t<whitelist>\n\t\t\t<directory>..\/<\/directory>\n\t\t\t<exclude>\n\t\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t\t<\/exclude>\n\t\t<\/whitelist>\n\t<\/filter>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
298+
if [ "$COVERAGE" == '1' ]; then
299+
sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<filter>\n\t\t<whitelist>\n\t\t\t<directory>..\/<\/directory>\n\t\t\t<exclude>\n\t\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t\t<\/exclude>\n\t\t<\/whitelist>\n\t<\/filter>/g;p;}' ".github/phpunit-$DB-github.xml" &> "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml"
301300
else
302-
mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
301+
mkdir -p "phpBB/ext/$EXTNAME/.github" && cp .github/phpunit* "$_"
303302
fi
304303
working-directory: ./phpBB3
305304

@@ -318,10 +317,10 @@ jobs:
318317
COVERAGE: ${{ matrix.COVERAGE == '1' && '1' || '0' }}
319318
run: |
320319
phpBB/vendor/bin/phpunit \
321-
--configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml \
320+
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
322321
--bootstrap ./tests/bootstrap.php \
323-
$([[ "$COVERAGE" == "1" ]] && echo "--coverage-clover build/logs/clover.xml") \
324-
$([[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional")
322+
"$( [[ "$COVERAGE" == "1" ]] && echo "--coverage-clover build/logs/clover.xml" )" \
323+
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
325324
working-directory: ./phpBB3
326325

327326
- name: Send code coverage
@@ -398,8 +397,8 @@ jobs:
398397
env:
399398
MATRIX_DB: ${{ matrix.db }}
400399
run: |
401-
db=$(echo "${MATRIX_DB%%:*}")
402-
echo "db=$db" >> $GITHUB_OUTPUT
400+
db="${MATRIX_DB%%:*}"
401+
echo "db=$db" >> "$GITHUB_OUTPUT"
403402
404403
- name: Setup PHP
405404
uses: shivammathur/setup-php@v2
@@ -413,14 +412,14 @@ jobs:
413412
DB: ${{steps.database-type.outputs.db}}
414413
PHP_VERSION: ${{ matrix.php }}
415414
NOTESTS: '0'
416-
run: .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
415+
run: .github/setup-phpbb.sh "$DB" "$PHP_VERSION" "${NOTESTS:-0}"
417416
working-directory: ./phpBB3
418417

419418
- name: Setup database
420419
env:
421420
DB: ${{steps.database-type.outputs.db}}
422421
MYISAM: '0'
423-
run: .github/setup-database.sh $DB $MYISAM
422+
run: .github/setup-database.sh "$DB" "$MYISAM"
424423
working-directory: ./phpBB3
425424

426425
- name: Set up Node.js
@@ -459,17 +458,17 @@ jobs:
459458
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
460459

461460
- name: Setup PHPUnit files
462-
run: mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
461+
run: mkdir -p "phpBB/ext/$EXTNAME/.github" && cp .github/phpunit* "$_"
463462
working-directory: ./phpBB3
464463

465464
- name: Run unit tests
466465
env:
467466
DB: ${{steps.database-type.outputs.db}}
468467
run: |
469468
phpBB/vendor/bin/phpunit \
470-
--configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml \
469+
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
471470
--bootstrap ./tests/bootstrap.php \
472-
$([[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional")
471+
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
473472
working-directory: ./phpBB3
474473
# END PostgreSQL Job
475474

@@ -537,9 +536,9 @@ jobs:
537536
then
538537
db='mssql'
539538
else
540-
db=$(echo "${MATRIX_DB%%:*}")
539+
db="${MATRIX_DB%%:*}"
541540
fi
542-
echo "db=$db" >> $GITHUB_OUTPUT
541+
echo "db=$db" >> "$GITHUB_OUTPUT"
543542
544543
- name: Setup PHP
545544
uses: shivammathur/setup-php@v2
@@ -553,14 +552,14 @@ jobs:
553552
DB: ${{steps.database-type.outputs.db}}
554553
PHP_VERSION: ${{ matrix.php }}
555554
NOTESTS: '0'
556-
run: .github/setup-phpbb.sh $DB $PHP_VERSION ${NOTESTS:-0}
555+
run: .github/setup-phpbb.sh "$DB" "$PHP_VERSION" "${NOTESTS:-0}"
557556
working-directory: ./phpBB3
558557

559558
- name: Setup database
560559
env:
561560
DB: ${{steps.database-type.outputs.db}}
562561
MYISAM: '0'
563-
run: .github/setup-database.sh $DB $MYISAM
562+
run: .github/setup-database.sh "$DB" "$MYISAM"
564563
working-directory: ./phpBB3
565564

566565
- name: Set up Node.js
@@ -599,17 +598,17 @@ jobs:
599598
working-directory: ./phpBB3/phpBB/ext/${{ env.EXTNAME }}
600599

601600
- name: Setup PHPUnit files
602-
run: mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
601+
run: mkdir -p "phpBB/ext/$EXTNAME/.github" && cp .github/phpunit* "$_"
603602
working-directory: ./phpBB3
604603

605604
- name: Run unit tests
606605
env:
607606
DB: ${{steps.database-type.outputs.db}}
608607
run: |
609608
phpBB/vendor/bin/phpunit \
610-
--configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml \
609+
--configuration "phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml" \
611610
--bootstrap ./tests/bootstrap.php \
612-
$([[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional")
611+
"$( [[ "$FUNCTIONAL_TESTS" == "0" ]] && echo "--exclude-group functional" )"
613612
working-directory: ./phpBB3
614613
# END Other Tests Job
615614

0 commit comments

Comments
 (0)