Skip to content

Commit 8c3a2d9

Browse files
authoredMay 25, 2020
travis: update image versions (go-sql-driver#1103)
* travis: update image versions * travis: use mysql client inside the docker container for polling * travis: force mysql client to connect via tcp * travis: use root pass in mysql client * travis: use empty root password
1 parent db7a5f2 commit 8c3a2d9

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed
 

‎.travis.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ jobs:
2626

2727
include:
2828
- env: DB=MYSQL8
29-
dist: trusty
29+
dist: xenial
3030
go: 1.14.x
3131
services:
3232
- docker
3333
before_install:
3434
- go get golang.org/x/tools/cmd/cover
3535
- go get github.com/mattn/goveralls
3636
- docker pull mysql:8.0
37-
- 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
37+
- 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_ALLOW_EMPTY_PASSWORD=yes
3838
mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
3939
- cp .travis/docker.cnf ~/.my.cnf
4040
- .travis/wait_mysql.sh
@@ -46,15 +46,15 @@ jobs:
4646
- export MYSQL_TEST_CONCURRENT=1
4747

4848
- env: DB=MYSQL57
49-
dist: trusty
49+
dist: xenial
5050
go: 1.14.x
5151
services:
5252
- docker
5353
before_install:
5454
- go get golang.org/x/tools/cmd/cover
5555
- go get github.com/mattn/goveralls
5656
- docker pull mysql:5.7
57-
- 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
57+
- 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_ALLOW_EMPTY_PASSWORD=yes
5858
mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
5959
- cp .travis/docker.cnf ~/.my.cnf
6060
- .travis/wait_mysql.sh
@@ -66,15 +66,15 @@ jobs:
6666
- export MYSQL_TEST_CONCURRENT=1
6767

6868
- env: DB=MARIA55
69-
dist: trusty
69+
dist: xenial
7070
go: 1.14.x
7171
services:
7272
- docker
7373
before_install:
7474
- go get golang.org/x/tools/cmd/cover
7575
- go get github.com/mattn/goveralls
7676
- docker pull mariadb:5.5
77-
- 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+
- 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_ALLOW_EMPTY_PASSWORD=yes
7878
mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
7979
- cp .travis/docker.cnf ~/.my.cnf
8080
- .travis/wait_mysql.sh
@@ -86,15 +86,15 @@ jobs:
8686
- export MYSQL_TEST_CONCURRENT=1
8787

8888
- env: DB=MARIA10_1
89-
dist: trusty
89+
dist: xenial
9090
go: 1.14.x
9191
services:
9292
- docker
9393
before_install:
9494
- go get golang.org/x/tools/cmd/cover
9595
- go get github.com/mattn/goveralls
9696
- docker pull mariadb:10.1
97-
- 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
97+
- 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_ALLOW_EMPTY_PASSWORD=yes
9898
mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1
9999
- cp .travis/docker.cnf ~/.my.cnf
100100
- .travis/wait_mysql.sh
@@ -106,7 +106,7 @@ jobs:
106106
- export MYSQL_TEST_CONCURRENT=1
107107

108108
- os: osx
109-
osx_image: xcode10.1
109+
osx_image: xcode11.4
110110
addons:
111111
homebrew:
112112
packages:

‎.travis/wait_mysql.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
#!/bin/sh
2+
3+
# use the mysql client inside the docker container if docker is running
4+
[ "$(docker inspect -f '{{.State.Running}}' mysqld 2>/dev/null)" = "true" ] && mysql() {
5+
docker exec mysqld mysql "${@}"
6+
}
7+
28
while :
39
do
4-
if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then
10+
if mysql --protocol=tcp -e 'select version()'; then
511
break
612
fi
713
sleep 3

0 commit comments

Comments
 (0)