Skip to content

Commit f180739

Browse files
iMattProiMattPro
authored
Update tests.yml for master branch
1 parent 1958e21 commit f180739

1 file changed

Lines changed: 53 additions & 58 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 53 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ env:
3333
jobs:
3434
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
3535
basic-checks:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-latest
3737
strategy:
3838
matrix:
3939
include:
40-
- php: '7.2'
41-
db: "none"
40+
- db: 'none'
41+
php: '8.1'
4242
NOTESTS: 1
4343

4444
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -60,7 +60,7 @@ jobs:
6060
uses: shivammathur/setup-php@v2
6161
with:
6262
php-version: ${{ matrix.php }}
63-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
63+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
6464
coverage: none
6565

6666
- name: Setup environment for phpBB
@@ -101,46 +101,46 @@ jobs:
101101

102102
# START MySQL and MariaDB Job
103103
mysql-tests:
104-
runs-on: ubuntu-22.04
104+
runs-on: ubuntu-latest
105105
strategy:
106106
matrix:
107107
include:
108-
- php: '7.2'
109-
db: "mariadb:10.1"
110-
- php: '7.2'
108+
- php: '8.1'
111109
db: "mariadb:10.2"
112-
- php: '7.2'
110+
- php: '8.1'
113111
db: "mariadb:10.3"
114-
- php: '7.2'
112+
- php: '8.1'
115113
db: "mariadb:10.4"
116-
- php: '7.2'
117-
db: "mariadb:10.5"
118-
- php: '7.2'
119-
db: "mysql:5.6"
114+
- php: '8.1'
115+
db: "mariadb:10.6"
116+
- php: '8.1'
117+
db: "mariadb:10.9"
118+
- php: '8.1'
119+
db: "mariadb:10.10"
120+
- php: '8.1'
121+
db: "mariadb:10.11"
122+
- php: '8.1'
123+
db: "mysql:5.7"
120124
db_alias: "MyISAM Tests"
121125
MYISAM: 1
122-
- php: '7.2'
123-
db: "mysql:5.6"
124-
- php: '7.2'
125-
db: "mysql:5.7"
126-
COVERAGE: 1
127-
db_alias: "mysql:5.7 with Coverage"
128-
- php: '7.3'
129-
db: "mysql:5.7"
130-
- php: '7.4'
131-
db: "mysql:5.7"
132-
- php: '7.4'
126+
- php: '8.1'
133127
db: "mysql:8.0"
134-
- php: '8.0'
135-
db: "mysql:5.7"
128+
COVERAGE: 1
129+
db_alias: "mysql:8.0 with Coverage"
136130
- php: '8.1'
137-
db: "mysql:5.7"
131+
db: "mysql:8.1"
138132
- php: '8.2'
139-
db: "mysql:5.7"
133+
db: "mysql:8.0"
134+
- php: '8.2'
135+
db: "mariadb:10.2"
140136
- php: '8.3'
141137
db: "mysql:5.7"
138+
- php: '8.3'
139+
db: "mariadb:10.2"
142140
- php: '8.4'
143-
db: "mysql:5.7"
141+
db: "mysql:8.0"
142+
- php: '8.4'
143+
db: "mariadb:10.3"
144144

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

@@ -193,7 +193,7 @@ jobs:
193193
uses: shivammathur/setup-php@v2
194194
with:
195195
php-version: ${{ matrix.php }}
196-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
196+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
197197
coverage: none
198198

199199
- name: Setup PHP with Coverage
@@ -226,7 +226,7 @@ jobs:
226226
run: |
227227
if [ $COVERAGE == '1' ]
228228
then
229-
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
229+
sed -n '1h;1!H;${;g;s/<\/php>/<\/php>\n\t<coverage>\n\t\t<include>\n\t\t\t<directory>..\/<\/directory>\n\t\t<\/include>\n\t\t<exclude>\n\t\t\t<directory>..\/tests\/<\/directory>\n\t\t\t<directory>..\/language\/<\/directory>\n\t\t\t<directory>..\/migrations\/<\/directory>\n\t\t<\/exclude>\n\t<\/coverage>/g;p;}' .github/phpunit-$DB-github.xml &> phpBB/ext/$EXTNAME/.github/phpunit-$DB-github.xml
230230
else
231231
mkdir -p phpBB/ext/$EXTNAME/.github && cp .github/phpunit* $_
232232
fi
@@ -254,44 +254,38 @@ jobs:
254254

255255
# START PostgreSQL Job
256256
postgres-tests:
257-
runs-on: ubuntu-22.04
257+
runs-on: ubuntu-latest
258258
strategy:
259259
matrix:
260260
include:
261-
- php: '7.2'
261+
- php: '8.1'
262262
db: "postgres:9.5"
263-
- php: '7.2'
263+
- php: '8.1'
264264
db: "postgres:9.6"
265-
- php: '7.2'
265+
- php: '8.1'
266266
db: "postgres:10"
267-
- php: '7.2'
267+
- php: '8.1'
268268
db: "postgres:11"
269-
- php: '7.2'
270-
db: "postgres:12"
271-
- php: '7.2'
272-
db: "postgres:13"
273-
- php: '7.3'
274-
db: "postgres:13"
275-
- php: '7.4'
276-
db: "postgres:13"
277-
- php: '8.0'
269+
- php: '8.1'
278270
db: "postgres:12"
279-
- php: '8.0'
271+
- php: '8.1'
280272
db: "postgres:13"
281273
- php: '8.1'
282274
db: "postgres:14"
275+
- php: '8.1'
276+
db: "postgres:15"
283277
- php: '8.2'
284-
db: "postgres:14"
278+
db: "postgres:9.5"
285279
- php: '8.3'
286-
db: "postgres:14"
280+
db: "postgres:9.5"
287281
- php: '8.4'
288-
db: "postgres:14"
282+
db: "postgres:9.5"
289283

290284
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
291285

292286
services:
293287
postgres:
294-
image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && 'postgres:10' || matrix.db }}
288+
image: ${{ matrix.db != 'postgres:9.5' && matrix.db != 'postgres:9.6' && matrix.db != 'postgres:10' && matrix.db != 'postgres:11' && matrix.db != 'postgres:12' && matrix.db != 'postgres:13' && matrix.db != 'postgres:14' && matrix.db != 'postgres:15' && 'postgres:10' || matrix.db }}
295289
env:
296290
POSTGRES_HOST: localhost
297291
POSTGRES_USER: postgres
@@ -339,7 +333,7 @@ jobs:
339333
uses: shivammathur/setup-php@v2
340334
with:
341335
php-version: ${{ matrix.php }}
342-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
336+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
343337
coverage: none
344338

345339
- name: Setup environment for phpBB
@@ -374,20 +368,21 @@ jobs:
374368
strategy:
375369
matrix:
376370
include:
377-
- php: '7.2'
371+
- php: '8.1'
378372
db: "sqlite3"
379-
- php: '7.2'
373+
- php: '8.1'
380374
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
381375
db_alias: 'MSSQL 2019'
382-
- php: '7.2'
376+
- php: '8.1'
383377
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
384378
db_alias: 'MSSQL 2022'
385379

380+
386381
name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
387382

388383
services:
389384
mssql:
390-
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 }}
385+
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }}
391386
env:
392387
SA_PASSWORD: "Pssw0rd_12"
393388
ACCEPT_EULA: "y"
@@ -427,7 +422,7 @@ jobs:
427422
env:
428423
MATRIX_DB: ${{ matrix.db }}
429424
run: |
430-
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' ]
425+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
431426
then
432427
db='mssql'
433428
else
@@ -439,7 +434,7 @@ jobs:
439434
uses: shivammathur/setup-php@v2
440435
with:
441436
php-version: ${{ matrix.php }}
442-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
437+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
443438
coverage: none
444439

445440
- name: Setup environment for phpBB

0 commit comments

Comments
 (0)