Skip to content

Commit a791112

Browse files
committed
ci: update MariaDB versions
MariaDB versions where a little out of date. 10.7 and <=10.3 are end of maintained versions. Currently supported versions are: https://mariadb.org/about/#maintenance-policy Add latest and very latest development versions so incompatibilities can be found pre-release (ref: https://mariadb.org/new-service-quay-io-mariadb-foundation-mariadb-devel/). A healthcheck.sh script is there for convience. (https://mariadb.com/kb/en/using-healthcheck-sh-script/). Only MARIADB_ROOT_PASSWORD is required as env variable.
1 parent 125aebe commit a791112

File tree

1 file changed

+16
-13
lines changed

1 file changed

+16
-13
lines changed

azure-pipelines.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -139,26 +139,30 @@ jobs:
139139
DATABASE_URL: mysql://root:[email protected]/mysql
140140
displayName: Run tests in Docker
141141
142-
- job: "TestMariaDb"
142+
- job: "TestMariaDB"
143143
pool:
144144
vmImage: "ubuntu-latest"
145145
strategy:
146146
maxParallel: 10
147147
matrix:
148-
v113:
149-
DB_VERSION: "11.3"
148+
verylatest:
149+
CONTAINER: "quay.io/mariadb-foundation/mariadb-devel:verylatest"
150+
latest:
151+
CONTAINER: "quay.io/mariadb-foundation/mariadb-devel:latest"
152+
v114:
153+
CONTAINER: "mariadb:11.4"
150154
v1011:
151-
DB_VERSION: "10.11"
155+
CONTAINER: "mariadb:10.11"
152156
v106:
153-
DB_VERSION: "10.6"
157+
CONTAINER: "mariadb:10.6"
154158
v105:
155-
DB_VERSION: "10.5"
159+
CONTAINER: "mariadb:10.5"
156160
v104:
157-
DB_VERSION: "10.4"
161+
CONTAINER: "mariadb:10.4"
158162
steps:
159163
- bash: |
160164
sudo apt-get update
161-
sudo apt-get install docker.io netcat grep
165+
sudo apt-get install docker.io
162166
sudo systemctl unmask docker
163167
sudo systemctl start docker
164168
docker --version
@@ -174,8 +178,7 @@ jobs:
174178
-v `pwd`:/root \
175179
-p 3307:3306 \
176180
-e MARIADB_ROOT_PASSWORD=password \
177-
-e MYSQL_ROOT_PASSWORD=password \
178-
mariadb:$(DB_VERSION) \
181+
$(CONTAINER) \
179182
--max-allowed-packet=36700160 \
180183
--local-infile \
181184
--performance-schema=on \
@@ -184,8 +187,8 @@ jobs:
184187
--ssl-ca=/root/rust-mysql-simple/tests/ca.crt \
185188
--ssl-cert=/root/rust-mysql-simple/tests/server.crt \
186189
--ssl-key=/root/rust-mysql-simple/tests/server-key.pem &
187-
while ! nc -W 1 localhost 3307 | grep -q -P '.+'; do sleep 1; done
188-
displayName: Run MariaDb in Docker
190+
while ! docker exec container healthcheck.sh --connect --innodb_initialized ; do sleep 1; echo waiting; done
191+
displayName: Run MariaDB in Docker
189192
- bash: |
190193
docker exec container bash -l -c "apt-get update"
191194
docker exec container bash -l -c "apt-get install -y curl clang libssl-dev pkg-config"
@@ -196,7 +199,7 @@ jobs:
196199
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
197200
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test"
198201
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true COMPRESS=true cargo test"
199-
if [[ "10.1" != "$(DB_VERSION)" ]]; then docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --no-default-features --features default-rustls"; fi
202+
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --no-default-features --features default-rustls"
200203
env:
201204
RUST_BACKTRACE: 1
202205
DATABASE_URL: mysql://root:[email protected]/mysql

0 commit comments

Comments
 (0)