From 75e89122adc3e97af60e7887ccf53f8921f48041 Mon Sep 17 00:00:00 2001
From: Tiexin Guo <guotiexin@gmail.com>
Date: Thu, 31 Mar 2022 09:18:16 +0800
Subject: [PATCH] ci: move goimports back to makefile

---
 .github/workflows/automated-release.yml       |  4 ---
 .github/workflows/e2e-test.yml                |  2 --
 .github/workflows/main-builder.yml            |  4 ---
 .../{ut-linux.yml => pr-builder.yml}          |  7 +++--
 .github/workflows/ut-mac.yml                  | 30 -------------------
 Makefile                                      |  1 +
 6 files changed, 5 insertions(+), 43 deletions(-)
 rename .github/workflows/{ut-linux.yml => pr-builder.yml} (85%)
 delete mode 100644 .github/workflows/ut-mac.yml

diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml
index 63a84a2a5..671c3b986 100644
--- a/.github/workflows/automated-release.yml
+++ b/.github/workflows/automated-release.yml
@@ -23,8 +23,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
@@ -61,8 +59,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
index 4815c34ee..507f7c125 100644
--- a/.github/workflows/e2e-test.yml
+++ b/.github/workflows/e2e-test.yml
@@ -17,8 +17,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/main-builder.yml b/.github/workflows/main-builder.yml
index 9f99a7860..d05979b61 100644
--- a/.github/workflows/main-builder.yml
+++ b/.github/workflows/main-builder.yml
@@ -13,8 +13,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
@@ -38,8 +36,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ut-linux.yml b/.github/workflows/pr-builder.yml
similarity index 85%
rename from .github/workflows/ut-linux.yml
rename to .github/workflows/pr-builder.yml
index 839997ad4..be1e58611 100644
--- a/.github/workflows/ut-linux.yml
+++ b/.github/workflows/pr-builder.yml
@@ -4,7 +4,10 @@ on:
     branches: [ main ]
 jobs:
   build-and-test:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - run: echo "🐧 This job is now running on a ${{ runner.os }}-${{ runner.arch }} server hosted by GitHub!"
       - name: Checkout
@@ -13,8 +16,6 @@ jobs:
         uses: actions/setup-go@v2
         with:
           go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
       - name: Cache
         uses: actions/cache@v2
         with:
diff --git a/.github/workflows/ut-mac.yml b/.github/workflows/ut-mac.yml
deleted file mode 100644
index aa5b380da..000000000
--- a/.github/workflows/ut-mac.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: ut on mac
-on:
-  pull_request:
-    branches: [ main ]
-jobs:
-  build-and-test:
-    runs-on: macos-latest
-    steps:
-      - run: echo "🐧 This job is now running on a ${{ runner.os }}-${{ runner.arch }} server hosted by GitHub!"
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Setup Golang env
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.17
-      - name: Install goimports
-        run: go install golang.org/x/tools/cmd/goimports@latest
-      - name: Cache
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cache/go-build
-            ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - name: Build
-        run: make build -j8
-      - name: Test
-        run: go test -v ./...
diff --git a/Makefile b/Makefile
index c72a8086b..8fada9436 100644
--- a/Makefile
+++ b/Makefile
@@ -65,6 +65,7 @@ md5-plugin.%:
 
 .PHONY: fmt
 fmt: ## Run 'go fmt' & goimports against code.
+	go install golang.org/x/tools/cmd/goimports@latest
 	goimports -local="github.com/merico-dev/stream" -d -w cmd
 	goimports -local="github.com/merico-dev/stream" -d -w pkg
 	goimports -local="github.com/merico-dev/stream" -d -w internal