Skip to content

Commit 75e8912

Browse files
committed
ci: move goimports back to makefile
1 parent 68124d5 commit 75e8912

File tree

6 files changed

+5
-43
lines changed

6 files changed

+5
-43
lines changed

.github/workflows/automated-release.yml

-4
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ jobs:
2323
uses: actions/setup-go@v2
2424
with:
2525
go-version: 1.17
26-
- name: Install goimports
27-
run: go install golang.org/x/tools/cmd/goimports@latest
2826
- name: Cache
2927
uses: actions/cache@v2
3028
with:
@@ -61,8 +59,6 @@ jobs:
6159
uses: actions/setup-go@v2
6260
with:
6361
go-version: 1.17
64-
- name: Install goimports
65-
run: go install golang.org/x/tools/cmd/goimports@latest
6662
- name: Cache
6763
uses: actions/cache@v2
6864
with:

.github/workflows/e2e-test.yml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
uses: actions/setup-go@v2
1818
with:
1919
go-version: 1.17
20-
- name: Install goimports
21-
run: go install golang.org/x/tools/cmd/goimports@latest
2220
- name: Cache
2321
uses: actions/cache@v2
2422
with:

.github/workflows/main-builder.yml

-4
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
uses: actions/setup-go@v2
1414
with:
1515
go-version: 1.17
16-
- name: Install goimports
17-
run: go install golang.org/x/tools/cmd/goimports@latest
1816
- name: Cache
1917
uses: actions/cache@v2
2018
with:
@@ -38,8 +36,6 @@ jobs:
3836
uses: actions/setup-go@v2
3937
with:
4038
go-version: 1.17
41-
- name: Install goimports
42-
run: go install golang.org/x/tools/cmd/goimports@latest
4339
- name: Cache
4440
uses: actions/cache@v2
4541
with:

.github/workflows/ut-linux.yml .github/workflows/pr-builder.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ on:
44
branches: [ main ]
55
jobs:
66
build-and-test:
7-
runs-on: ubuntu-latest
7+
strategy:
8+
matrix:
9+
os: [ubuntu-latest, macos-latest]
10+
runs-on: ${{ matrix.os }}
811
steps:
912
- run: echo "🐧 This job is now running on a ${{ runner.os }}-${{ runner.arch }} server hosted by GitHub!"
1013
- name: Checkout
@@ -13,8 +16,6 @@ jobs:
1316
uses: actions/setup-go@v2
1417
with:
1518
go-version: 1.17
16-
- name: Install goimports
17-
run: go install golang.org/x/tools/cmd/goimports@latest
1819
- name: Cache
1920
uses: actions/cache@v2
2021
with:

.github/workflows/ut-mac.yml

-30
This file was deleted.

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ md5-plugin.%:
6565

6666
.PHONY: fmt
6767
fmt: ## Run 'go fmt' & goimports against code.
68+
go install golang.org/x/tools/cmd/goimports@latest
6869
goimports -local="github.com/merico-dev/stream" -d -w cmd
6970
goimports -local="github.com/merico-dev/stream" -d -w pkg
7071
goimports -local="github.com/merico-dev/stream" -d -w internal

0 commit comments

Comments
 (0)