From 55cb2610d8f95f038c30b6e0dbb76c309a3a7015 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sun, 17 May 2020 17:38:34 +0200 Subject: [PATCH 1/5] travis: update image versions --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 74d9cd022..d8966b9d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,7 +26,7 @@ jobs: include: - env: DB=MYSQL8 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -45,7 +45,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MYSQL57 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -64,7 +64,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MARIA55 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -83,7 +83,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - env: DB=MARIA10_1 - dist: trusty + dist: xenial go: 1.14.x services: - docker @@ -102,7 +102,7 @@ jobs: - export MYSQL_TEST_CONCURRENT=1 - os: osx - osx_image: xcode10.1 + osx_image: xcode11.4 addons: homebrew: packages: From 1ffb8c90dc554063c18649046f0a8fc099991897 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Mon, 18 May 2020 00:12:38 +0200 Subject: [PATCH 2/5] travis: use mysql client inside the docker container for polling --- .travis/wait_mysql.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index e87993e57..14c825ee7 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -1,7 +1,13 @@ #!/bin/sh + +# use the mysql client inside the docker container if docker is running +[ "$(docker inspect -f '{{.State.Running}}' mysqld 2>/dev/null)" = "true" ] && mysql() { + docker exec mysqld mysql "${@}" +} + while : do - if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then + if mysql -e 'select version()'; then break fi sleep 3 From 9f788833f4baae4e24a26e5faf3c599faed35fb2 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Mon, 18 May 2020 11:34:28 +0200 Subject: [PATCH 3/5] travis: force mysql client to connect via tcp --- .travis/wait_mysql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index 14c825ee7..fa2054ff1 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -7,7 +7,7 @@ while : do - if mysql -e 'select version()'; then + if mysql --protocol=tcp -e 'select version()'; then break fi sleep 3 From 42f18022a77f0dfef15065ac368dd18dc381bb59 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Mon, 18 May 2020 11:45:23 +0200 Subject: [PATCH 4/5] travis: use root pass in mysql client --- .travis/wait_mysql.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index fa2054ff1..aa1786af7 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -7,7 +7,7 @@ while : do - if mysql --protocol=tcp -e 'select version()'; then + if mysql --protocol=tcp --password=${MYSQL_ROOT_PASSWORD} -e 'select version()'; then break fi sleep 3 From f38bd27a9d0b65ce35294ca5208064344a8b8f06 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Mon, 18 May 2020 12:42:31 +0200 Subject: [PATCH 5/5] travis: use empty root password --- .travis.yml | 8 ++++---- .travis/wait_mysql.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8966b9d4..704f8c6a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mysql:8.0 - - 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 + - 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 mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -53,7 +53,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mysql:5.7 - - 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 + - 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 mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -72,7 +72,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mariadb:5.5 - - 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 + - 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 mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh @@ -91,7 +91,7 @@ jobs: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - docker pull mariadb:10.1 - - 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 + - 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 mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index aa1786af7..fa2054ff1 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -7,7 +7,7 @@ while : do - if mysql --protocol=tcp --password=${MYSQL_ROOT_PASSWORD} -e 'select version()'; then + if mysql --protocol=tcp -e 'select version()'; then break fi sleep 3