From 819ca1f0827ec41a469133664a4167763579cdc3 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Thu, 23 Mar 2017 20:15:06 +0900 Subject: [PATCH 1/2] travis: Add MySQL 5.7 test --- .travis.yml | 20 ++++++++++++++++++++ .travis/docker.cnf | 5 +++++ .travis/wait_mysql.sh | 8 ++++++++ 3 files changed, 33 insertions(+) create mode 100644 .travis/docker.cnf create mode 100755 .travis/wait_mysql.sh diff --git a/.travis.yml b/.travis.yml index c1cc10aaf..260573cc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,5 +9,25 @@ go: - 1.7 - tip +matrix: + include: + sudo: required + dist: trusty + go: 1.8 + services: + - docker + before_install: + - 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=1G + - 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 + before_script: - mysql -e 'create database gotest;' diff --git a/.travis/docker.cnf b/.travis/docker.cnf new file mode 100644 index 000000000..e57754e5a --- /dev/null +++ b/.travis/docker.cnf @@ -0,0 +1,5 @@ +[client] +user = gotest +password = secret +host = 127.0.0.1 +port = 3307 diff --git a/.travis/wait_mysql.sh b/.travis/wait_mysql.sh new file mode 100755 index 000000000..abcf5f0ae --- /dev/null +++ b/.travis/wait_mysql.sh @@ -0,0 +1,8 @@ +#!/bin/sh +while : +do + sleep 3 + if mysql -e 'select version()'; then + break + fi +done From 1f1c5cba91c6e28654a0935ae13871a5163c2d1d Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 24 Mar 2017 10:42:48 +0900 Subject: [PATCH 2/2] travis: Add MariaDB 5.5 and 10.1 test --- .travis.yml | 77 +++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 60 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 260573cc9..bfbf71204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,23 +11,66 @@ go: matrix: include: - sudo: required - dist: trusty - go: 1.8 - services: - - docker - before_install: - - 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=1G - - 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 + go: 1.8 + services: + - docker + before_install: + - 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 + - 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=MARIA55 + sudo: required + dist: trusty + go: 1.8 + services: + - docker + before_install: + - 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 + - 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=MARIA10_1 + sudo: required + dist: trusty + go: 1.8 + services: + - docker + before_install: + - 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 + - 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 + before_script: - mysql -e 'create database gotest;'