Skip to content

Commit c81725d

Browse files
iMattProiMattPro
committed
Fix tests
1 parent 2388ab3 commit c81725d

1 file changed

Lines changed: 60 additions & 57 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 60 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@ env:
44
EXTNAME: phpbb/mediaembed # 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:
1313
branches: # Run tests when commits are pushed to these branches in your repo
14+
- main
1415
- master
1516
- develop
1617
pull_request: # Run tests when pull requests are made on these branches in your repo
1718
branches:
19+
- main
1820
- master
1921
- develop
2022

2123
jobs:
2224
# START Basic Checks Job (EPV, code sniffer, images check, etc.)
2325
basic-checks:
24-
runs-on: ubuntu-22.04
26+
runs-on: ubuntu-latest
2527
strategy:
2628
matrix:
2729
include:
28-
- php: '7.2'
29-
db: "none"
30+
- db: 'none'
31+
php: '8.1'
3032
NOTESTS: 1
3133

3234
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
@@ -48,7 +50,7 @@ jobs:
4850
uses: shivammathur/setup-php@v2
4951
with:
5052
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
53+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv
5254
coverage: none
5355

5456
- name: Setup environment for phpBB
@@ -89,44 +91,46 @@ jobs:
8991

9092
# START MySQL and MariaDB Job
9193
mysql-tests:
92-
runs-on: ubuntu-22.04
94+
runs-on: ubuntu-latest
9395
strategy:
9496
matrix:
9597
include:
96-
- php: '7.2'
97-
db: "mariadb:10.1"
98-
- php: '7.2'
98+
- php: '8.1'
9999
db: "mariadb:10.2"
100-
- php: '7.2'
100+
- php: '8.1'
101101
db: "mariadb:10.3"
102-
- php: '7.2'
102+
- php: '8.1'
103103
db: "mariadb:10.4"
104-
- php: '7.2'
105-
db: "mariadb:10.5"
106-
- php: '7.2'
107-
db: "mysql:5.6"
104+
- php: '8.1'
105+
db: "mariadb:10.6"
106+
- php: '8.1'
107+
db: "mariadb:10.9"
108+
- php: '8.1'
109+
db: "mariadb:10.10"
110+
- php: '8.1'
111+
db: "mariadb:10.11"
112+
- php: '8.1'
113+
db: "mysql:5.7"
108114
db_alias: "MyISAM Tests"
109115
MYISAM: 1
110-
- php: '7.2'
111-
db: "mysql:5.6"
112-
- php: '7.2'
116+
- php: '8.1'
113117
db: "mysql:5.7"
114118
COVERAGE: 1
115119
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"
124120
- php: '8.1'
125-
db: "mysql:5.7"
121+
db: "mysql:8.1"
126122
- php: '8.2'
127-
db: "mysql:5.7"
123+
db: "mysql:8.0"
124+
- php: '8.2'
125+
db: "mariadb:10.2"
128126
- php: '8.3'
129127
db: "mysql:5.7"
128+
- php: '8.3'
129+
db: "mariadb:10.2"
130+
- php: '8.4'
131+
db: "mysql:8.0"
132+
- php: '8.4'
133+
db: "mariadb:10.3"
130134

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

@@ -179,7 +183,7 @@ jobs:
179183
uses: shivammathur/setup-php@v2
180184
with:
181185
php-version: ${{ matrix.php }}
182-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
186+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
183187
coverage: none
184188

185189
- name: Setup PHP with Coverage
@@ -240,42 +244,38 @@ jobs:
240244

241245
# START PostgreSQL Job
242246
postgres-tests:
243-
runs-on: ubuntu-22.04
247+
runs-on: ubuntu-latest
244248
strategy:
245249
matrix:
246250
include:
247-
- php: '7.2'
251+
- php: '8.1'
248252
db: "postgres:9.5"
249-
- php: '7.2'
253+
- php: '8.1'
250254
db: "postgres:9.6"
251-
- php: '7.2'
255+
- php: '8.1'
252256
db: "postgres:10"
253-
- php: '7.2'
257+
- php: '8.1'
254258
db: "postgres:11"
255-
- php: '7.2'
256-
db: "postgres:12"
257-
- php: '7.2'
258-
db: "postgres:13"
259-
- php: '7.3'
260-
db: "postgres:13"
261-
- php: '7.4'
262-
db: "postgres:13"
263-
- php: '8.0'
259+
- php: '8.1'
264260
db: "postgres:12"
265-
- php: '8.0'
261+
- php: '8.1'
266262
db: "postgres:13"
267263
- php: '8.1'
268264
db: "postgres:14"
265+
- php: '8.1'
266+
db: "postgres:15"
269267
- php: '8.2'
270-
db: "postgres:14"
268+
db: "postgres:9.5"
271269
- php: '8.3'
272-
db: "postgres:14"
270+
db: "postgres:9.5"
271+
- php: '8.4'
272+
db: "postgres:9.5"
273273

274274
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
275275

276276
services:
277277
postgres:
278-
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 }}
278+
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 }}
279279
env:
280280
POSTGRES_HOST: localhost
281281
POSTGRES_USER: postgres
@@ -323,7 +323,7 @@ jobs:
323323
uses: shivammathur/setup-php@v2
324324
with:
325325
php-version: ${{ matrix.php }}
326-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
326+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
327327
coverage: none
328328

329329
- name: Setup environment for phpBB
@@ -354,24 +354,27 @@ jobs:
354354

355355
# START Other Tests Job (SQLite 3 and mssql)
356356
other-tests:
357-
runs-on: ubuntu-22.04
357+
runs-on: ubuntu-20.04
358358
strategy:
359359
matrix:
360360
include:
361-
- php: '7.2'
361+
- php: '8.1'
362362
db: "sqlite3"
363-
- php: '7.2'
363+
- php: '8.1'
364364
db: "mcr.microsoft.com/mssql/server:2017-latest"
365365
db_alias: 'MSSQL 2017'
366-
- php: '7.2'
367-
db: "mcr.microsoft.com/mssql/server:2019-latest"
366+
- php: '8.1'
367+
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
368368
db_alias: 'MSSQL 2019'
369+
- php: '8.1'
370+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
371+
db_alias: 'MSSQL 2022'
369372

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

372375
services:
373376
mssql:
374-
image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }}
377+
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 }}
375378
env:
376379
SA_PASSWORD: "Pssw0rd_12"
377380
ACCEPT_EULA: "y"
@@ -411,7 +414,7 @@ jobs:
411414
env:
412415
MATRIX_DB: ${{ matrix.db }}
413416
run: |
414-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ]
417+
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' ]
415418
then
416419
db='mssql'
417420
else
@@ -423,7 +426,7 @@ jobs:
423426
uses: shivammathur/setup-php@v2
424427
with:
425428
php-version: ${{ matrix.php }}
426-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
429+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
427430
coverage: none
428431

429432
- name: Setup environment for phpBB

0 commit comments

Comments
 (0)