@@ -132,30 +132,28 @@ jobs:
132132 DATABASE_URL: mysql://root:[email protected] /mysql 133133 displayName: Run tests in Docker
134134
135- - job : " TestMariaDb "
135+ - job : " TestMariaDB "
136136 pool :
137137 vmImage : " ubuntu-latest"
138138 strategy :
139139 maxParallel : 10
140140 matrix :
141- v107 :
142- DB_VERSION : " 10.7"
141+ verylatest :
142+ CONTAINER : " quay.io/mariadb-foundation/mariadb-devel:verylatest"
143+ latest :
144+ CONTAINER : " quay.io/mariadb-foundation/mariadb-devel:latest"
145+ v1011 :
146+ CONTAINER : " mariadb:10.11"
143147 v106 :
144- DB_VERSION : " 10.6"
148+ CONTAINER : " mariadb: 10.6"
145149 v105 :
146- DB_VERSION : " 10.5"
150+ CONTAINER : " mariadb: 10.5"
147151 v104 :
148- DB_VERSION : " 10.4"
149- v103 :
150- DB_VERSION : " 10.3"
151- v102 :
152- DB_VERSION : " 10.2"
153- v101 :
154- DB_VERSION : " 10.1"
152+ CONTAINER : " mariadb:10.4"
155153 steps :
156154 - bash : |
157155 sudo apt-get update
158- sudo apt-get install docker.io netcat grep
156+ sudo apt-get install docker.io
159157 sudo systemctl unmask docker
160158 sudo systemctl start docker
161159 docker --version
@@ -171,8 +169,7 @@ jobs:
171169 -v `pwd`:/root \
172170 -p 3307:3306 \
173171 -e MARIADB_ROOT_PASSWORD=password \
174- -e MYSQL_ROOT_PASSWORD=password \
175- mariadb:$(DB_VERSION) \
172+ $(CONTAINER) \
176173 --max-allowed-packet=36700160 \
177174 --local-infile \
178175 --performance-schema=on \
@@ -181,8 +178,8 @@ jobs:
181178 --ssl-ca=/root/rust-mysql-simple/tests/ca.crt \
182179 --ssl-cert=/root/rust-mysql-simple/tests/server.crt \
183180 --ssl-key=/root/rust-mysql-simple/tests/server-key.pem &
184- while ! nc -W 1 localhost 3307 | grep -q -P '.+' ; do sleep 1; done
185- displayName: Run MariaDb in Docker
181+ while ! docker exec container healthcheck.sh --connect --innodb_initialized ; do sleep 1; echo waiting ; done
182+ displayName: Run MariaDB in Docker
186183 - bash : |
187184 docker exec container bash -l -c "apt-get update"
188185 docker exec container bash -l -c "apt-get install -y curl clang libssl-dev pkg-config"
@@ -193,7 +190,7 @@ jobs:
193190 docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL COMPRESS=true cargo test"
194191 docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test"
195192 docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true COMPRESS=true cargo test"
196- 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
193+ docker exec container bash -l -c "cd \$HOME && DATABASE_URL=$DATABASE_URL SSL=true cargo test --no-default-features --features default-rustls"
197194 env:
198195 RUST_BACKTRACE: 1
199196 DATABASE_URL: mysql://root:[email protected] /mysql
0 commit comments