Skip to content

Commit 0206e42

Browse files
author
Sergey Vilgelm
committed
Add tests-on-macos to cover all main platforms
Run golangci-lint-action in matrics mode for all platforms
1 parent cae1842 commit 0206e42

File tree

1 file changed

+16
-7
lines changed

1 file changed

+16
-7
lines changed

.github/workflows/pr.yml

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ jobs:
1111
# We already run the current golangci-lint in tests, but here we test
1212
# our GitHub action with the latest stable golangci-lint.
1313
golangci-lint:
14-
name: golangci-lint
1514
runs-on: ubuntu-latest
1615
steps:
1716
- uses: actions/checkout@v2
1817
- name: lint
1918
uses: golangci/golangci-lint-action@v2
2019
with:
2120
version: latest
21+
args: --timeout 4m
2222
tests-on-windows:
2323
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
2424
runs-on: windows-latest
@@ -28,20 +28,29 @@ jobs:
2828
uses: actions/setup-go@v2
2929
with:
3030
go-version: 1.14 # test only the latest go version to speed up CI
31-
- name: Run tests on Windows
31+
- name: Run tests
3232
run: make.exe test
3333
continue-on-error: true
34+
tests-on-macos:
35+
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
36+
runs-on: macos-latest
37+
steps:
38+
- uses: actions/checkout@v2
39+
- name: Install Go
40+
uses: actions/setup-go@v2
41+
with:
42+
go-version: 1.14 # test only the latest go version to speed up CI
43+
- name: Run tests
44+
run: make test
45+
continue-on-error: true
3446
tests-on-unix:
3547
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
36-
runs-on: ${{ matrix.os }}
48+
runs-on: ubuntu-latest
3749
strategy:
3850
matrix:
3951
golang:
4052
- 1.13
4153
- 1.14
42-
os:
43-
- ubuntu-latest
44-
# don't enable mac os because it's machines are very slow
4554
steps:
4655
- uses: actions/checkout@v2
4756
- name: Install Go
@@ -54,7 +63,7 @@ jobs:
5463
key: ${{ runner.os }}-go-${{ matrix.golang }}-${{ hashFiles('**/go.sum') }}
5564
restore-keys: |
5665
${{ runner.os }}-go-${{ matrix.golang }}-
57-
- name: Run tests on Unix-like operating systems
66+
- name: Run tests
5867
run: make test
5968
check_generated:
6069
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors

0 commit comments

Comments
 (0)