Skip to content

Commit b57e352

Browse files
iMattProiMattPro
committed
Fix tests
1 parent 42315b4 commit b57e352

1 file changed

Lines changed: 54 additions & 57 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 54 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ env:
44
EXTNAME: phpbb/autogroups # Your extension vendor/package name
55
SNIFF: 1 # Run code sniffer on your code? 1 or 0
66
IMAGE_ICC: 1 # Run icc profile sniffer on your images? 1 or 0
7-
EPV: 1 # Run EPV (Extension Pre Validator) on your code? 1 or 0
7+
EPV: 0 # Run EPV (Extension Pre Validator) on your code? 1 or 0
88
EXECUTABLE_FILES: 1 # Run check for executable files? 1 or 0
9-
PHPBB_BRANCH: 3.3.x # The phpBB branch to run tests on
9+
PHPBB_BRANCH: master # The phpBB branch to run tests on
1010

1111
on:
1212
push:
@@ -21,12 +21,12 @@ on:
2121
jobs:
2222
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2323
basic-checks:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
2525
strategy:
2626
matrix:
2727
include:
28-
- php: '7.2'
29-
db: "none"
28+
- db: 'none'
29+
php: '8.1'
3030
NOTESTS: 1
3131

3232
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -48,7 +48,7 @@ jobs:
4848
uses: shivammathur/setup-php@v2
4949
with:
5050
php-version: ${{ matrix.php }}
51-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
51+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
5252
coverage: none
5353

5454
- name: Setup environment for phpBB
@@ -89,46 +89,46 @@ jobs:
8989

9090
# START MySQL and MariaDB Job
9191
mysql-tests:
92-
runs-on: ubuntu-22.04
92+
runs-on: ubuntu-latest
9393
strategy:
9494
matrix:
9595
include:
96-
- php: '7.2'
97-
db: "mariadb:10.1"
98-
- php: '7.2'
96+
- php: '8.1'
9997
db: "mariadb:10.2"
100-
- php: '7.2'
98+
- php: '8.1'
10199
db: "mariadb:10.3"
102-
- php: '7.2'
100+
- php: '8.1'
103101
db: "mariadb:10.4"
104-
- php: '7.2'
105-
db: "mariadb:10.5"
106-
- php: '7.2'
107-
db: "mysql:5.6"
102+
- php: '8.1'
103+
db: "mariadb:10.6"
104+
- php: '8.1'
105+
db: "mariadb:10.9"
106+
- php: '8.1'
107+
db: "mariadb:10.10"
108+
- php: '8.1'
109+
db: "mariadb:10.11"
110+
- php: '8.1'
111+
db: "mysql:5.7"
108112
db_alias: "MyISAM Tests"
109113
MYISAM: 1
110-
- php: '7.2'
111-
db: "mysql:5.6"
112-
- php: '7.2'
114+
- php: '8.1'
113115
db: "mysql:5.7"
114116
COVERAGE: 1
115117
db_alias: "mysql:5.7 with Coverage"
116-
- php: '7.3'
117-
db: "mysql:5.7"
118-
- php: '7.4'
119-
db: "mysql:5.7"
120-
- php: '7.4'
121-
db: "mysql:8.0"
122-
- php: '8.0'
123-
db: "mysql:5.7"
124118
- php: '8.1'
125-
db: "mysql:5.7"
119+
db: "mysql:8.1"
126120
- php: '8.2'
127-
db: "mysql:5.7"
121+
db: "mysql:8.0"
122+
- php: '8.2'
123+
db: "mariadb:10.2"
128124
- php: '8.3'
129125
db: "mysql:5.7"
126+
- php: '8.3'
127+
db: "mariadb:10.2"
130128
- php: '8.4'
131-
db: "mysql:5.7"
129+
db: "mysql:8.0"
130+
- php: '8.4'
131+
db: "mariadb:10.3"
132132

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

@@ -181,7 +181,7 @@ jobs:
181181
uses: shivammathur/setup-php@v2
182182
with:
183183
php-version: ${{ matrix.php }}
184-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
184+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
185185
coverage: none
186186

187187
- name: Setup PHP with Coverage
@@ -242,44 +242,38 @@ jobs:
242242

243243
# START PostgreSQL Job
244244
postgres-tests:
245-
runs-on: ubuntu-22.04
245+
runs-on: ubuntu-latest
246246
strategy:
247247
matrix:
248248
include:
249-
- php: '7.2'
249+
- php: '8.1'
250250
db: "postgres:9.5"
251-
- php: '7.2'
251+
- php: '8.1'
252252
db: "postgres:9.6"
253-
- php: '7.2'
253+
- php: '8.1'
254254
db: "postgres:10"
255-
- php: '7.2'
255+
- php: '8.1'
256256
db: "postgres:11"
257-
- php: '7.2'
258-
db: "postgres:12"
259-
- php: '7.2'
260-
db: "postgres:13"
261-
- php: '7.3'
262-
db: "postgres:13"
263-
- php: '7.4'
264-
db: "postgres:13"
265-
- php: '8.0'
257+
- php: '8.1'
266258
db: "postgres:12"
267-
- php: '8.0'
259+
- php: '8.1'
268260
db: "postgres:13"
269261
- php: '8.1'
270262
db: "postgres:14"
263+
- php: '8.1'
264+
db: "postgres:15"
271265
- php: '8.2'
272-
db: "postgres:14"
266+
db: "postgres:9.5"
273267
- php: '8.3'
274-
db: "postgres:14"
268+
db: "postgres:9.5"
275269
- php: '8.4'
276-
db: "postgres:14"
270+
db: "postgres:9.5"
277271

278272
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
279273

280274
services:
281275
postgres:
282-
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 }}
276+
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 }}
283277
env:
284278
POSTGRES_HOST: localhost
285279
POSTGRES_USER: postgres
@@ -327,7 +321,7 @@ jobs:
327321
uses: shivammathur/setup-php@v2
328322
with:
329323
php-version: ${{ matrix.php }}
330-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
324+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
331325
coverage: none
332326

333327
- name: Setup environment for phpBB
@@ -362,20 +356,23 @@ jobs:
362356
strategy:
363357
matrix:
364358
include:
365-
- php: '7.2'
359+
- php: '8.1'
366360
db: "sqlite3"
367-
- php: '7.2'
361+
- php: '8.1'
368362
db: "mcr.microsoft.com/mssql/server:2017-latest"
369363
db_alias: 'MSSQL 2017'
370-
- php: '7.2'
364+
- php: '8.1'
371365
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
372366
db_alias: 'MSSQL 2019'
367+
- php: '8.1'
368+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
369+
db_alias: 'MSSQL 2022'
373370

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

376373
services:
377374
mssql:
378-
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 }}
375+
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && 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:2017-latest' || matrix.db }}
379376
env:
380377
SA_PASSWORD: "Pssw0rd_12"
381378
ACCEPT_EULA: "y"
@@ -415,7 +412,7 @@ jobs:
415412
env:
416413
MATRIX_DB: ${{ matrix.db }}
417414
run: |
418-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
415+
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ]
419416
then
420417
db='mssql'
421418
else
@@ -427,7 +424,7 @@ jobs:
427424
uses: shivammathur/setup-php@v2
428425
with:
429426
php-version: ${{ matrix.php }}
430-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
427+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
431428
coverage: none
432429

433430
- name: Setup environment for phpBB

0 commit comments

Comments
 (0)