From ae89148537702b296ab2c8896063d8337b9f7f4e Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 20:52:06 +0900 Subject: [PATCH 1/6] travis: run test on macOS --- .travis.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8f653936b..43686c9d4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -99,6 +99,23 @@ matrix: - export MYSQL_TEST_ADDR=127.0.0.1:3307 - export MYSQL_TEST_CONCURRENT=1 + - os: osx + osx_image: xcode10.1 + language: go + before_install: + - go get golang.org/x/tools/cmd/cover + - go get github.com/mattn/goveralls + - brew install mysql + before_script: + - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB" >> /usr/local/etc/my.cnf + - mysql.server start + - mysql -uroot -e 'CREATE USER gotest IDENTIFIED BY "secret"' + - mysql -uroot -e 'GRANT ALL ON *.* TO gotest' + - export MYSQL_TEST_USER=gotest + - export MYSQL_TEST_PASS=secret + - export MYSQL_TEST_ADDR=127.0.0.1:3307 + - export MYSQL_TEST_CONCURRENT=1 + script: - go test -v -covermode=count -coverprofile=coverage.out - go vet ./... From fb7144db8e9c5c632f2cb73cde2ac9a400b2c8ff Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 21:05:47 +0900 Subject: [PATCH 2/6] use Go 1.12 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 43686c9d4..f66a15d0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,7 +101,7 @@ matrix: - os: osx osx_image: xcode10.1 - language: go + go: 1.12.x before_install: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls From e1364cedf9dc3007b55488d7a1cbc42590450211 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 21:50:24 +0900 Subject: [PATCH 3/6] Use 3306 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f66a15d0f..1d1bab4c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -113,7 +113,7 @@ matrix: - mysql -uroot -e 'GRANT ALL ON *.* TO gotest' - export MYSQL_TEST_USER=gotest - export MYSQL_TEST_PASS=secret - - export MYSQL_TEST_ADDR=127.0.0.1:3307 + - export MYSQL_TEST_ADDR=127.0.0.1:3306 - export MYSQL_TEST_CONCURRENT=1 script: From 1d2c3b3e3e9e1f1c81950ffeb5c318bbcb504a4b Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 22:08:39 +0900 Subject: [PATCH 4/6] create database gotest --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1d1bab4c2..10ddcd5ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -111,6 +111,7 @@ matrix: - mysql.server start - mysql -uroot -e 'CREATE USER gotest IDENTIFIED BY "secret"' - mysql -uroot -e 'GRANT ALL ON *.* TO gotest' + - mysql -uroot -e 'create database gotest;' - export MYSQL_TEST_USER=gotest - export MYSQL_TEST_PASS=secret - export MYSQL_TEST_ADDR=127.0.0.1:3306 From 0240356fa1c0085828658cd6c8bf144cf7385b29 Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 22:24:56 +0900 Subject: [PATCH 5/6] local_infile=1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 10ddcd5ea..239edc7b1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,7 +107,7 @@ matrix: - go get github.com/mattn/goveralls - brew install mysql before_script: - - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB" >> /usr/local/etc/my.cnf + - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB\nlocal_infile=1" >> /usr/local/etc/my.cnf - mysql.server start - mysql -uroot -e 'CREATE USER gotest IDENTIFIED BY "secret"' - mysql -uroot -e 'GRANT ALL ON *.* TO gotest' From 1b3cf86ce05b3535c48fa7ddb16102befd7b3fda Mon Sep 17 00:00:00 2001 From: Inada Naoki Date: Wed, 20 Mar 2019 22:39:12 +0900 Subject: [PATCH 6/6] use addons: homebrew: packages instead of brew install --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 239edc7b1..eae311b14 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,11 +101,14 @@ matrix: - os: osx osx_image: xcode10.1 + addons: + homebrew: + packages: + - mysql go: 1.12.x before_install: - go get golang.org/x/tools/cmd/cover - go get github.com/mattn/goveralls - - brew install mysql before_script: - echo -e "[server]\ninnodb_log_file_size=256MB\ninnodb_buffer_pool_size=512MB\nmax_allowed_packet=16MB\nlocal_infile=1" >> /usr/local/etc/my.cnf - mysql.server start