Skip to content

Commit 4b755c9

Browse files
authored
Merge pull request #150 from iMattPro/fixes
Fix tests
2 parents 00a5bbc + 4d8c94e commit 4b755c9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ jobs:
227227
run: |
228228
if [ $COVERAGE == '1' ]
229229
then
230-
phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml --testsuite 'phpBB Test Suite'
230+
phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php --coverage-clover build/logs/clover.xml
231231
else
232232
phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml --bootstrap ./tests/bootstrap.php
233233
fi

skeleton/.github/workflows/tests.yml.twig

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,24 +327,24 @@ jobs:
327327

328328
# START Other Tests Job (SQLite 3 and mssql)
329329
other-tests:
330-
runs-on: ubuntu-20.04
330+
runs-on: ubuntu-22.04
331331
strategy:
332332
matrix:
333333
include:
334334
- php: '7.2'
335335
db: "sqlite3"
336-
- php: '7.2'
337-
db: "mcr.microsoft.com/mssql/server:2017-latest"
338-
db_alias: 'MSSQL 2017'
339336
- php: '7.2'
340337
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
341338
db_alias: 'MSSQL 2019'
339+
- php: '7.2'
340+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
341+
db_alias: 'MSSQL 2022'
342342

343343
name: PHP ${{ '{{' }} matrix.php }} - ${{ '{{' }} matrix.db_alias != '' && matrix.db_alias || matrix.db }}
344344

345345
services:
346346
mssql:
347-
image: ${{ '{{' }} matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
347+
image: ${{ '{{' }} matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
348348
env:
349349
SA_PASSWORD: "Pssw0rd_12"
350350
ACCEPT_EULA: "y"
@@ -384,7 +384,7 @@ jobs:
384384
env:
385385
MATRIX_DB: ${{ '{{' }} matrix.db }}
386386
run: |
387-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
387+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
388388
then
389389
db='mssql'
390390
else

0 commit comments

Comments
 (0)