Skip to content

Commit 5be46cd

Browse files
authored
consolidate dbs we test against (#310)
1 parent 42d43a7 commit 5be46cd

File tree

2 files changed

+33
-54
lines changed

2 files changed

+33
-54
lines changed

.github/workflows/build.yml

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -71,52 +71,47 @@ jobs:
7171
runs-on: ubuntu-latest
7272

7373
services:
74-
# MySQL LTS versions + very latest stable tested (https://endoflife.date/mysql)
75-
mysql80:
76-
image: mysql:8.0
77-
ports:
78-
- 3306:3306
79-
options: --health-cmd="mysqladmin ping -ppass" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=nextras_dbal_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
74+
# MySQL The last LTS version + the latest stable (https://endoflife.date/mysql)
8075
mysql84:
8176
image: mysql:8.4
8277
ports:
83-
- 3307:3306
78+
- 3306:3306
8479
options: --health-cmd="mysqladmin ping -ppass" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=nextras_dbal_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
85-
mysql92:
86-
image: mysql:9.2
80+
mysql94:
81+
image: mysql:9.4
8782
ports:
88-
- 3308:3306
83+
- 3307:3306
8984
options: --health-cmd="mysqladmin ping -ppass" --health-interval=10s --health-timeout=5s --health-retries=5 -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=nextras_dbal_test --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --mysql-native-password=ON"
90-
# Latest 2 MariaDD LTS versions tested (https://endoflife.date/mariadb)
91-
mariadb1011:
92-
image: mariadb:10.11
85+
# MariaDD The last LTS version + the latest stable (https://endoflife.date/mariadb)
86+
mariadb1108:
87+
image: mariadb:11.8
9388
env:
94-
MYSQL_DATABASE: nextras_dbal_test
95-
MYSQL_ROOT_PASSWORD: root
89+
MARIADB_DATABASE: nextras_dbal_test
90+
MARIADB_ROOT_PASSWORD: root
9691
ports:
9792
- 3406:3306
9893
options: >-
99-
--health-cmd "mysqladmin ping -ppass"
94+
--health-cmd "healthcheck.sh --connect --innodb_initialized"
10095
--health-interval 10s
10196
--health-start-period 10s
10297
--health-timeout 5s
10398
--health-retries 10
104-
mariadb1104:
105-
image: mariadb:11.4
99+
mariadb1200:
100+
image: mariadb:12.0
106101
env:
107-
MYSQL_DATABASE: nextras_dbal_test
108-
MYSQL_ROOT_PASSWORD: root
102+
MARIADB_DATABASE: nextras_dbal_test
103+
MARIADB_ROOT_PASSWORD: root
109104
ports:
110105
- 3407:3306
111106
options: >-
112-
--health-cmd "healthcheck.sh --su-mysql --connect --innodb_initialized"
107+
--health-cmd "healthcheck.sh --connect --innodb_initialized"
113108
--health-interval 10s
114109
--health-start-period 10s
115110
--health-timeout 5s
116111
--health-retries 10
117112
# Newest and last supported version (https://endoflife.date/postgresql)
118-
postgres13:
119-
image: postgres:13
113+
postgres14:
114+
image: postgres:14
120115
env:
121116
POSTGRES_USER: postgres
122117
POSTGRES_PASSWORD: postgres
@@ -128,8 +123,8 @@ jobs:
128123
--health-interval 10s
129124
--health-timeout 5s
130125
--health-retries 5
131-
postgres17:
132-
image: postgres:17
126+
postgres18:
127+
image: postgres:18
133128
env:
134129
POSTGRES_USER: postgres
135130
POSTGRES_PASSWORD: postgres
@@ -168,7 +163,7 @@ jobs:
168163
run: docker exec -i mssql /opt/mssql-tools18/bin/sqlcmd -C -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE nextras_dbal_test'
169164

170165
- name: Set up Timezones in MariaDB
171-
run: docker exec $(docker ps -q --filter "ancestor=mariadb:11.4") bash -c "apt-get update && apt-get install -y tzdata && mariadb-tzinfo-to-sql /usr/share/zoneinfo 2>/dev/null | mariadb -u root -proot mysql"
166+
run: for container in $(docker ps -q --filter "ancestor=mariadb"); do docker exec "$container" bash -c "apt-get update && apt-get install -y tzdata && mariadb-tzinfo-to-sql /usr/share/zoneinfo 2>/dev/null | mariadb -u root -proot mysql"; done
172167

173168
- name: Setup PHP cache environment
174169
id: php-extensions-cache

tests/databases.github.ini

Lines changed: 12 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,92 @@
1-
[mysql 8.0]
1+
[mysql 8.4]
22
driver = mysqli
33
host = "127.0.0.1"
44
database = nextras_dbal_test
55
username = root
66
password = root
77
port = 3306
88

9-
[mysql 8.0pdo]
9+
[mysql 8.4pdo]
1010
driver = pdo_mysql
1111
host = "127.0.0.1"
1212
database = nextras_dbal_test
1313
username = root
1414
password = root
1515
port = 3306
1616

17-
[mysql 8.4]
17+
[mysql 9.4]
1818
driver = mysqli
1919
host = "127.0.0.1"
2020
database = nextras_dbal_test
2121
username = root
2222
password = root
2323
port = 3307
2424

25-
[mysql 8.4pdo]
25+
[mysql 9.4pdo]
2626
driver = pdo_mysql
2727
host = "127.0.0.1"
2828
database = nextras_dbal_test
2929
username = root
3030
password = root
3131
port = 3307
3232

33-
[mysql 9.2]
34-
driver = mysqli
35-
host = "127.0.0.1"
36-
database = nextras_dbal_test
37-
username = root
38-
password = root
39-
port = 3308
40-
41-
[mysql 9.2pdo]
42-
driver = pdo_mysql
43-
host = "127.0.0.1"
44-
database = nextras_dbal_test
45-
username = root
46-
password = root
47-
port = 3308
48-
49-
[mysql mariadb1011]
33+
[mysql mariadb1108]
5034
driver = mysqli
5135
host = "127.0.0.1"
5236
database = nextras_dbal_test
5337
username = root
5438
password = root
5539
port = 3406
5640

57-
[mysql mariadb1011pdo]
41+
[mysql mariadb1108pdo]
5842
driver = pdo_mysql
5943
host = "127.0.0.1"
6044
database = nextras_dbal_test
6145
username = root
6246
password = root
6347
port = 3406
6448

65-
[mysql mariadb1104]
49+
[mysql mariadb1200]
6650
driver = mysqli
6751
host = "127.0.0.1"
6852
database = nextras_dbal_test
6953
username = root
7054
password = root
7155
port = 3407
7256

73-
[mysql mariadb1104pdo]
57+
[mysql mariadb1200pdo]
7458
driver = pdo_mysql
7559
host = "127.0.0.1"
7660
database = nextras_dbal_test
7761
username = root
7862
password = root
7963
port = 3407
8064

81-
[pgsql 13]
65+
[pgsql 14]
8266
driver = pgsql
8367
host = "127.0.0.1"
8468
database = nextras_dbal_test
8569
username = postgres
8670
password = postgres
8771
port = 5432
8872

89-
[pgsql 13pdo]
73+
[pgsql 14pdo]
9074
driver = pdo_pgsql
9175
host = "127.0.0.1"
9276
database = nextras_dbal_test
9377
username = postgres
9478
password = postgres
9579
port = 5432
9680

97-
[pgsql 17]
81+
[pgsql 18]
9882
driver = pgsql
9983
host = "127.0.0.1"
10084
database = nextras_dbal_test
10185
username = postgres
10286
password = postgres
10387
port = 5433
10488

105-
[pgsql 17pdo]
89+
[pgsql 18pdo]
10690
driver = pdo_pgsql
10791
host = "127.0.0.1"
10892
database = nextras_dbal_test

0 commit comments

Comments
 (0)