Skip to content

Commit f3b2a10

Browse files
iMattProiMattPro
committed
Fix tests
1 parent 94c0ec9 commit f3b2a10

File tree

2 files changed

+57
-58
lines changed

2 files changed

+57
-58
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,31 @@ env:
44
EXTNAME: phpbb/cannedmessages # 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,44 @@ 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'
113-
db: "mysql:5.7"
114-
- php: '7.3'
115-
db: "mysql:5.7"
116-
- php: '7.4'
117-
db: "mysql:5.7"
118-
- php: '7.4'
116+
- php: '8.1'
119117
db: "mysql:8.0"
120-
- php: '8.0'
121-
db: "mysql:5.7"
122118
- php: '8.1'
123-
db: "mysql:5.7"
119+
db: "mysql:8.1"
124120
- php: '8.2'
125-
db: "mysql:5.7"
121+
db: "mysql:8.0"
122+
- php: '8.2'
123+
db: "mariadb:10.2"
126124
- php: '8.3'
127125
db: "mysql:5.7"
126+
- php: '8.3'
127+
db: "mariadb:10.2"
128128
- php: '8.4'
129-
db: "mysql:5.7"
129+
db: "mysql:8.0"
130+
- php: '8.4'
131+
db: "mariadb:10.3"
130132

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

@@ -178,7 +180,7 @@ jobs:
178180
uses: shivammathur/setup-php@v2
179181
with:
180182
php-version: ${{ matrix.php }}
181-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
183+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, mysqli, pdo, pdo_mysql, ldap
182184
coverage: none
183185

184186
- name: Setup environment for phpBB
@@ -209,44 +211,38 @@ jobs:
209211

210212
# START PostgreSQL Job
211213
postgres-tests:
212-
runs-on: ubuntu-22.04
214+
runs-on: ubuntu-latest
213215
strategy:
214216
matrix:
215217
include:
216-
- php: '7.2'
218+
- php: '8.1'
217219
db: "postgres:9.5"
218-
- php: '7.2'
220+
- php: '8.1'
219221
db: "postgres:9.6"
220-
- php: '7.2'
222+
- php: '8.1'
221223
db: "postgres:10"
222-
- php: '7.2'
224+
- php: '8.1'
223225
db: "postgres:11"
224-
- php: '7.2'
225-
db: "postgres:12"
226-
- php: '7.2'
227-
db: "postgres:13"
228-
- php: '7.3'
229-
db: "postgres:13"
230-
- php: '7.4'
231-
db: "postgres:13"
232-
- php: '8.0'
226+
- php: '8.1'
233227
db: "postgres:12"
234-
- php: '8.0'
228+
- php: '8.1'
235229
db: "postgres:13"
236230
- php: '8.1'
237231
db: "postgres:14"
232+
- php: '8.1'
233+
db: "postgres:15"
238234
- php: '8.2'
239-
db: "postgres:14"
235+
db: "postgres:9.5"
240236
- php: '8.3'
241-
db: "postgres:14"
237+
db: "postgres:9.5"
242238
- php: '8.4'
243-
db: "postgres:14"
239+
db: "postgres:9.5"
244240

245241
name: PHP ${{ matrix.php }} - ${{ matrix.db }}
246242

247243
services:
248244
postgres:
249-
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 }}
245+
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 }}
250246
env:
251247
POSTGRES_HOST: localhost
252248
POSTGRES_USER: postgres
@@ -294,7 +290,7 @@ jobs:
294290
uses: shivammathur/setup-php@v2
295291
with:
296292
php-version: ${{ matrix.php }}
297-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
293+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, pgsql, pdo, pdo_pgsql
298294
coverage: none
299295

300296
- name: Setup environment for phpBB
@@ -329,20 +325,23 @@ jobs:
329325
strategy:
330326
matrix:
331327
include:
332-
- php: '7.2'
328+
- php: '8.1'
333329
db: "sqlite3"
334-
- php: '7.2'
330+
- php: '8.1'
335331
db: "mcr.microsoft.com/mssql/server:2017-latest"
336332
db_alias: 'MSSQL 2017'
337-
- php: '7.2'
333+
- php: '8.1'
338334
db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
339335
db_alias: 'MSSQL 2019'
336+
- php: '8.1'
337+
db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
338+
db_alias: 'MSSQL 2022'
340339

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

343342
services:
344343
mssql:
345-
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 }}
344+
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 }}
346345
env:
347346
SA_PASSWORD: "Pssw0rd_12"
348347
ACCEPT_EULA: "y"
@@ -382,7 +381,7 @@ jobs:
382381
env:
383382
MATRIX_DB: ${{ matrix.db }}
384383
run: |
385-
if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ]
384+
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' ]
386385
then
387386
db='mssql'
388387
else
@@ -394,7 +393,7 @@ jobs:
394393
uses: shivammathur/setup-php@v2
395394
with:
396395
php-version: ${{ matrix.php }}
397-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, mysqli, sqlite, pdo_sqlite, intl, gd, exif, iconv, sqlsrv, pdo_sqlsrv, ldap
396+
extensions: dom, curl, libxml, mbstring, zip, pcntl, intl, gd, exif, iconv, sqlsrv, pdo, pdo_sqlsrv
398397
coverage: none
399398

400399
- name: Setup environment for phpBB

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"extra": {
2525
"display-name": "Canned Messages",
2626
"soft-require": {
27-
"phpbb/phpbb": ">=4.0.0-dev"
27+
"phpbb/phpbb": ">=4.0.0@dev"
2828
}
2929
}
3030
}

0 commit comments

Comments
 (0)