Skip to content

Commit d03e4c2

Browse files
Travis: Add MySQL 8.0 test enviornment (#798)
* travis: add mysql 8.0 env * travis: disable version check for mysql 8 debian does not have a compatible client yet * travis: set local-infile=1 * travis: try to fix waiting for mysql 8 and optimize wait time * travis: show output of wait script * travis: grep for successful execution * travis: remove sleep
1 parent 92a288d commit d03e4c2

File tree

2 files changed

+25
-11
lines changed

2 files changed

+25
-11
lines changed

.travis.yml

+23-9
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,26 @@ before_script:
1919

2020
matrix:
2121
include:
22+
- env: DB=MYSQL8
23+
sudo: required
24+
dist: trusty
25+
go: 1.10.x
26+
services:
27+
- docker
28+
before_install:
29+
- go get golang.org/x/tools/cmd/cover
30+
- go get github.com/mattn/goveralls
31+
- docker pull mysql:8.0
32+
- docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
33+
mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
34+
- cp .travis/docker.cnf ~/.my.cnf
35+
- .travis/wait_mysql.sh
36+
before_script:
37+
- export MYSQL_TEST_USER=gotest
38+
- export MYSQL_TEST_PASS=secret
39+
- export MYSQL_TEST_ADDR=127.0.0.1:3307
40+
- export MYSQL_TEST_CONCURRENT=1
41+
2242
- env: DB=MYSQL57
2343
sudo: required
2444
dist: trusty
@@ -30,10 +50,8 @@ matrix:
3050
- go get github.com/mattn/goveralls
3151
- docker pull mysql:5.7
3252
- docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
33-
mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
34-
- sleep 30
53+
mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
3554
- cp .travis/docker.cnf ~/.my.cnf
36-
- mysql --print-defaults
3755
- .travis/wait_mysql.sh
3856
before_script:
3957
- export MYSQL_TEST_USER=gotest
@@ -52,10 +70,8 @@ matrix:
5270
- go get github.com/mattn/goveralls
5371
- docker pull mariadb:5.5
5472
- docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
55-
mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
56-
- sleep 30
73+
mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
5774
- cp .travis/docker.cnf ~/.my.cnf
58-
- mysql --print-defaults
5975
- .travis/wait_mysql.sh
6076
before_script:
6177
- export MYSQL_TEST_USER=gotest
@@ -74,10 +90,8 @@ matrix:
7490
- go get github.com/mattn/goveralls
7591
- docker pull mariadb:10.1
7692
- docker run -d -p 127.0.0.1:3307:3306 --name mysqld -e MYSQL_DATABASE=gotest -e MYSQL_USER=gotest -e MYSQL_PASSWORD=secret -e MYSQL_ROOT_PASSWORD=verysecret
77-
mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB
78-
- sleep 30
93+
mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
7994
- cp .travis/docker.cnf ~/.my.cnf
80-
- mysql --print-defaults
8195
- .travis/wait_mysql.sh
8296
before_script:
8397
- export MYSQL_TEST_USER=gotest

.travis/wait_mysql.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
22
while :
33
do
4-
sleep 3
5-
if mysql -e 'select version()'; then
4+
if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then
65
break
76
fi
7+
sleep 3
88
done

0 commit comments

Comments
 (0)