From 0b7b58a78664f60ae00c6dcede9bfb54482af730 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sat, 19 May 2018 16:14:58 +0200 Subject: [PATCH 1/7] travis: add mysql 8.0 env --- .travis.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.travis.yml b/.travis.yml index 4e60b0801..ff92b9f5a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,28 @@ before_script: matrix: include: + - env: DB=MYSQL8 + sudo: required + dist: trusty + go: 1.10.x + services: + - docker + before_install: + - 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 + mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB + - sleep 30 + - cp .travis/docker.cnf ~/.my.cnf + - mysql --print-defaults + - .travis/wait_mysql.sh + before_script: + - export MYSQL_TEST_USER=gotest + - export MYSQL_TEST_PASS=secret + - export MYSQL_TEST_ADDR=127.0.0.1:3307 + - export MYSQL_TEST_CONCURRENT=1 + - env: DB=MYSQL57 sudo: required dist: trusty From b49f8e20538f85b26ff5846a879d6bd7b2fc41ad Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sat, 19 May 2018 16:32:55 +0200 Subject: [PATCH 2/7] travis: disable version check for mysql 8 debian does not have a compatible client yet --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ff92b9f5a..67737277b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ matrix: - sleep 30 - cp .travis/docker.cnf ~/.my.cnf - mysql --print-defaults - - .travis/wait_mysql.sh + # - .travis/wait_mysql.sh before_script: - export MYSQL_TEST_USER=gotest - export MYSQL_TEST_PASS=secret From 5ca2c0eb3f1902b20de897f38b0159c90ab388d6 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sat, 19 May 2018 23:29:18 +0200 Subject: [PATCH 3/7] travis: set local-infile=1 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 67737277b..eebcfbf2f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ matrix: - 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 - mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB + mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - sleep 30 - cp .travis/docker.cnf ~/.my.cnf - mysql --print-defaults @@ -52,7 +52,7 @@ matrix: - 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 - mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB + mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - sleep 30 - cp .travis/docker.cnf ~/.my.cnf - mysql --print-defaults @@ -74,7 +74,7 @@ matrix: - 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 - mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB + mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - sleep 30 - cp .travis/docker.cnf ~/.my.cnf - mysql --print-defaults @@ -96,7 +96,7 @@ matrix: - 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 - mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB + mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - sleep 30 - cp .travis/docker.cnf ~/.my.cnf - mysql --print-defaults From d060cabd2a403f0418eb4e75686faaa0bcb0295b Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sun, 20 May 2018 13:07:52 +0200 Subject: [PATCH 4/7] travis: try to fix waiting for mysql 8 and optimize wait time --- .travis.yml | 14 +++++--------- .travis/wait_mysql.sh | 4 ++-- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index eebcfbf2f..b6ce58000 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,9 @@ matrix: - 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 mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 30 + - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - - mysql --print-defaults - # - .travis/wait_mysql.sh + - .travis/wait_mysql.sh before_script: - export MYSQL_TEST_USER=gotest - export MYSQL_TEST_PASS=secret @@ -53,9 +52,8 @@ matrix: - 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 mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 30 + - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - - mysql --print-defaults - .travis/wait_mysql.sh before_script: - export MYSQL_TEST_USER=gotest @@ -75,9 +73,8 @@ matrix: - 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 mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 30 + - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - - mysql --print-defaults - .travis/wait_mysql.sh before_script: - export MYSQL_TEST_USER=gotest @@ -97,9 +94,8 @@ matrix: - 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 mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 30 + - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - - mysql --print-defaults - .travis/wait_mysql.sh before_script: - export MYSQL_TEST_USER=gotest diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index abcf5f0ae..bc4dce416 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -1,8 +1,8 @@ #!/bin/sh while : do - sleep 3 - if mysql -e 'select version()'; then + if mysql -e 'select version()' 2>&1 | grep 'ERROR 1045 (28000):\|ERROR 2059 (HY000):'; then break fi + sleep 3 done From 593bdb6b0d8be5314a3625b2fc5b66d72179667e Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sun, 20 May 2018 13:12:16 +0200 Subject: [PATCH 5/7] travis: show output of wait script --- .travis/wait_mysql.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index bc4dce416..444b263da 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -v while : do if mysql -e 'select version()' 2>&1 | grep 'ERROR 1045 (28000):\|ERROR 2059 (HY000):'; then From 4877f8ed5adbd3eceed91956fe8a1d79cd54b4b2 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sun, 20 May 2018 13:21:07 +0200 Subject: [PATCH 6/7] travis: grep for successful execution --- .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 444b263da..b7c4c8008 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -2,7 +2,7 @@ set -v while : do - if mysql -e 'select version()' 2>&1 | grep 'ERROR 1045 (28000):\|ERROR 2059 (HY000):'; then + if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then break fi sleep 3 From 0f3c33fb5f1f81c832e0ff279f84cdc3d4ab8863 Mon Sep 17 00:00:00 2001 From: Julien Schmidt Date: Sun, 20 May 2018 13:27:30 +0200 Subject: [PATCH 7/7] travis: remove sleep --- .travis.yml | 4 ---- .travis/wait_mysql.sh | 1 - 2 files changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index b6ce58000..cc1268c36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,6 @@ matrix: - 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 mysql:8.0 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh before_script: @@ -52,7 +51,6 @@ matrix: - 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 mysql:5.7 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh before_script: @@ -73,7 +71,6 @@ matrix: - 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 mariadb:5.5 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh before_script: @@ -94,7 +91,6 @@ matrix: - 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 mariadb:10.1 --innodb_log_file_size=256MB --innodb_buffer_pool_size=512MB --max_allowed_packet=16MB --local-infile=1 - - sleep 10 - cp .travis/docker.cnf ~/.my.cnf - .travis/wait_mysql.sh before_script: diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh index b7c4c8008..e87993e57 100755 --- a/.travis/wait_mysql.sh +++ b/.travis/wait_mysql.sh @@ -1,5 +1,4 @@ #!/bin/sh -set -v while : do if mysql -e 'select version()' 2>&1 | grep 'version()\|ERROR 2059 (HY000):'; then