Skip to content

Commit 7b8d37e

Browse files
committed
ci: include lint in same matrix
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent a985354 commit 7b8d37e

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

.github/workflows/test.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ jobs:
4141
with:
4242
go-version: ${{ matrix.go }}
4343
go-version-file: "go.mod" # used when go-version is not specified.
44+
- name: golangci-lint
45+
uses: golangci/golangci-lint-action@v9
46+
with:
47+
args: --timeout=5m
4448
- name: Build for ${{ matrix.platform }}
4549
run: go build ./...
4650
- name: Test
@@ -66,26 +70,11 @@ jobs:
6670
with:
6771
go-version: ${{ matrix.go }}
6872
go-version-file: "go.mod" # used when go-version is not specified.
69-
- name: Build for ${{ matrix.platform }}
70-
run: go build ./...
71-
- name: Test
72-
run: go test -v ./...
73-
74-
lint:
75-
name: Lint ${{ matrix.platform }}
76-
timeout-minutes: 10
77-
strategy:
78-
fail-fast: false
79-
matrix:
80-
platform: [ubuntu-24.04, windows-latest, macos-latest]
81-
runs-on: ${{ matrix.platform }}
82-
steps:
83-
- uses: actions/checkout@v6
84-
- uses: actions/setup-go@v6
85-
with:
86-
go-version: "stable"
87-
cache: false
8873
- name: golangci-lint
8974
uses: golangci/golangci-lint-action@v9
9075
with:
9176
args: --timeout=5m
77+
- name: Build for ${{ matrix.platform }}
78+
run: go build ./...
79+
- name: Test
80+
run: go test -v ./...

0 commit comments

Comments
 (0)