ci: move goimports back to makefile

devstream-io · Mar 31, 2022 · 75e8912 · 75e8912
1 parent 68124d5
commit 75e8912
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 43 deletions.
diff --git 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
@@ -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
@@ -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 → .github/workflows/pr-builder.yml b/.github/workflows/ut-linux.yml → .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
diff --git 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