From 72a9463df0ffd0afc14d3bbdc06faf53ab774829 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 23 Dec 2020 12:33:16 +0900
Subject: [PATCH 1/3] Run macOS CI on Github Actions

---
 .github/workflows/mac.yaml | 41 ++++++++++++++++++++++++++++++++++++++
 .travis.yml                | 23 ---------------------
 2 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 .github/workflows/mac.yaml

diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml
new file mode 100644
index 000000000..3a9e07732
--- /dev/null
+++ b/.github/workflows/mac.yaml
@@ -0,0 +1,41 @@
+name: Build macOS Wheels
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: macos-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up MySQL
+        run: |
+          brew install mysql
+          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'
+          mysql -uroot -e 'create database gotest;'
+
+      - name: Set up Go
+        run: |
+          go install golang.org/x/tools/cmd/cover
+
+      - name: Run tests
+        env:
+          MYSQL_TEST_USER: gotest
+          MYSQL_TEST_PASS: secret
+          MYSQL_TEST_ADDR: 127.0.0.1:3306
+          MYSQL_TEST_CONCURRENT: 1
+        run: |
+          go test -v -covermode=count -coverprofile=coverage.out
+          go vet ./...
+          gofmt -d -s .
+
+      - uses: shogo82148/actions-goveralls@v1
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-profile: coverage.out
diff --git a/.travis.yml b/.travis.yml
index 2926bdd11..4777a3e42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,29 +106,6 @@ jobs:
         - export MYSQL_TEST_ADDR=127.0.0.1:3307
         - export MYSQL_TEST_CONCURRENT=1
 
-    - os: osx
-      osx_image: xcode11.4
-      addons:
-        homebrew:
-          packages:
-            - mysql
-          update: true
-      go: 1.15.x
-      before_install:
-        - go get golang.org/x/tools/cmd/cover
-        - go get github.com/mattn/goveralls
-      before_script:
-        - export cross_compile=false
-        - 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'
-        - 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
-        - export MYSQL_TEST_CONCURRENT=1
-
 script:
   - go test -v -covermode=count -coverprofile=coverage.out
   - go vet ./...

From 71361dc5e9a708b0b3239136f6018334a6973004 Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 23 Dec 2020 12:49:50 +0900
Subject: [PATCH 2/3] no cover

---
 .github/workflows/mac.yaml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml
index 3a9e07732..f2fbc823c 100644
--- a/.github/workflows/mac.yaml
+++ b/.github/workflows/mac.yaml
@@ -34,8 +34,3 @@ jobs:
           go test -v -covermode=count -coverprofile=coverage.out
           go vet ./...
           gofmt -d -s .
-
-      - uses: shogo82148/actions-goveralls@v1
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-profile: coverage.out

From e45c5735bf4d39ab601318dc2e55f0382d34bb1b Mon Sep 17 00:00:00 2001
From: Inada Naoki <songofacandy@gmail.com>
Date: Wed, 23 Dec 2020 12:54:39 +0900
Subject: [PATCH 3/3] Fix workflow name

---
 .github/workflows/mac.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/mac.yaml b/.github/workflows/mac.yaml
index f2fbc823c..f80a90b6e 100644
--- a/.github/workflows/mac.yaml
+++ b/.github/workflows/mac.yaml
@@ -1,4 +1,4 @@
-name: Build macOS Wheels
+name: Test on macOS
 on:
   push:
   pull_request: