Visitar URL original
Merge pull request #7048 from rubencm/ticket/17718 · phpbb/phpbb@76fc1d4 · GitHub
Skip to content

Commit 76fc1d4

Browse files
authored
Merge pull request #7048 from rubencm/ticket/17718
[ticket/17718] Update test matrix to support new database versions
2 parents 4a462d8 + 6d2bb2e commit 76fc1d4

1 file changed

Lines changed: 27 additions & 12 deletions

File tree

‎.github/workflows/tests.yml‎

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,15 @@ jobs:
112112
- php: '8.2'
113113
db: "mariadb:10.6"
114114
- php: '8.2'
115-
db: "mariadb:10.9"
115+
db: "mariadb:10.11"
116116
- php: '8.2'
117-
db: "mariadb:10.10"
117+
db: "mariadb:11.4"
118118
- php: '8.2'
119-
db: "mariadb:10.11"
119+
db: "mariadb:11.8"
120+
- php: '8.2'
121+
db: "mariadb:12.3"
122+
- php: '8.2'
123+
db: "mariadb:13.0"
120124
- php: '8.2'
121125
db: "mysql:8.0"
122126
db_alias: "MySQL Slow Tests"
@@ -130,15 +134,13 @@ jobs:
130134
- php: '8.2'
131135
db: "mysql:8.4"
132136
- php: '8.2'
133-
db: "mysql:9.4"
137+
db: "mysql:9.7"
134138
- php: '8.3'
135139
db: "mysql:8.0"
136140
- php: '8.4'
137141
db: "mysql:8.4"
138142
- php: '8.5'
139143
db: "mysql:8.4"
140-
- php: '8.5'
141-
db: "mysql:9.4"
142144

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

@@ -151,7 +153,7 @@ jobs:
151153
ports:
152154
- 3306:3306
153155
options: >-
154-
--health-cmd="mysqladmin ping"
156+
--health-cmd="mariadb-admin ping || mysqladmin ping"
155157
--health-interval=10s
156158
--health-timeout=5s
157159
--health-retries=3
@@ -278,6 +280,12 @@ jobs:
278280
db: "postgres:14"
279281
- php: '8.2'
280282
db: "postgres:15"
283+
- php: '8.2'
284+
db: "postgres:16"
285+
- php: '8.2'
286+
db: "postgres:17"
287+
- php: '8.2'
288+
db: "postgres:18"
281289
- php: '8.3'
282290
db: "postgres:10"
283291
- php: '8.4'
@@ -396,12 +404,16 @@ jobs:
396404
db_image: ''
397405
- php: '8.2'
398406
db: "mssql"
399-
db_image: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04"
407+
db_image: "mcr.microsoft.com/mssql/server:2019-CU32-ubuntu-20.04"
400408
db_alias: 'MSSQL 2019'
401409
- php: '8.2'
402410
db: "mssql"
403-
db_image: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04"
411+
db_image: "mcr.microsoft.com/mssql/server:2022-CU27-ubuntu-22.04"
404412
db_alias: 'MSSQL 2022'
413+
- php: '8.2'
414+
db: "mssql"
415+
db_image: "mcr.microsoft.com/mssql/server:2025-CU9-ubuntu-22.04"
416+
db_alias: 'MSSQL 2025'
405417

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

@@ -414,7 +426,7 @@ jobs:
414426
ports:
415427
- 1433:1433
416428
options: >-
417-
--health-cmd="/opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
429+
--health-cmd="PATH=$PATH:/opt/mssql-tools18/bin:/opt/mssql-tools/bin sqlcmd -C -S localhost -U sa -P 'Pssw0rd_12' -Q \"Use [master]; CREATE DATABASE [phpbb_tests] COLLATE Latin1_General_CI_AS\" || exit 1"
418430
--health-interval 10s
419431
--health-timeout 5s
420432
--health-retries 5
@@ -501,8 +513,11 @@ jobs:
501513
timeout-minutes: 20
502514
strategy:
503515
matrix:
504-
php: ['8.2']
505-
db: ['postgres']
516+
include:
517+
- php: '8.2'
518+
db: "postgres"
519+
- php: '8.5'
520+
db: "postgres"
506521

507522
name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }}
508523

0 commit comments

Comments
 (0)