@@ -139,26 +139,30 @@ jobs:
139
139
DATABASE_URL: mysql://root:[email protected] /mysql
140
140
displayName: Run tests in Docker
141
141
142
- - job : " TestMariaDb "
142
+ - job : " TestMariaDB "
143
143
pool :
144
144
vmImage : " ubuntu-latest"
145
145
strategy :
146
146
maxParallel : 10
147
147
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"
150
154
v1011 :
151
- DB_VERSION : " 10.11"
155
+ CONTAINER : " mariadb: 10.11"
152
156
v106 :
153
- DB_VERSION : " 10.6"
157
+ CONTAINER : " mariadb: 10.6"
154
158
v105 :
155
- DB_VERSION : " 10.5"
159
+ CONTAINER : " mariadb: 10.5"
156
160
v104 :
157
- DB_VERSION : " 10.4"
161
+ CONTAINER : " mariadb: 10.4"
158
162
steps :
159
163
- bash : |
160
164
sudo apt-get update
161
- sudo apt-get install docker.io netcat grep
165
+ sudo apt-get install docker.io
162
166
sudo systemctl unmask docker
163
167
sudo systemctl start docker
164
168
docker --version
@@ -174,8 +178,7 @@ jobs:
174
178
-v `pwd`:/root \
175
179
-p 3307:3306 \
176
180
-e MARIADB_ROOT_PASSWORD=password \
177
- -e MYSQL_ROOT_PASSWORD=password \
178
- mariadb:$(DB_VERSION) \
181
+ $(CONTAINER) \
179
182
--max-allowed-packet=36700160 \
180
183
--local-infile \
181
184
--performance-schema=on \
@@ -184,8 +187,8 @@ jobs:
184
187
--ssl-ca=/root/rust-mysql-simple/tests/ca.crt \
185
188
--ssl-cert=/root/rust-mysql-simple/tests/server.crt \
186
189
--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
189
192
- bash : |
190
193
docker exec container bash -l -c "apt-get update"
191
194
docker exec container bash -l -c "apt-get install -y curl clang libssl-dev pkg-config"
@@ -196,7 +199,7 @@ jobs:
196
199
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
197
200
docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test"
198
201
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"
200
203
env:
201
204
RUST_BACKTRACE: 1
202
205
DATABASE_URL: mysql://root:[email protected] /mysql
0 commit comments