Skip to content

Commit 85331a8

Browse files
authored
Merge pull request #179 from thaJeztah/update_golangci_lint
gha: update golangci-lint to v1.46, add Go 1.18, remove Go 1.15
2 parents b730778 + 03ab91c commit 85331a8

File tree

8 files changed

+26
-21
lines changed

8 files changed

+26
-21
lines changed

.github/workflows/validate.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -30,40 +30,40 @@ jobs:
3030
lint:
3131
runs-on: ubuntu-20.04
3232
steps:
33-
- uses: actions/checkout@v2
34-
- uses: golangci/golangci-lint-action@v2
33+
- uses: actions/checkout@v3
34+
- uses: actions/setup-go@v2
3535
with:
36-
# must be specified without patch version
37-
version: v1.36
38-
# Only show new issues for a pull request.
39-
only-new-issues: true
36+
go-version: 1.18.x
37+
- uses: golangci/golangci-lint-action@v3
38+
with:
39+
version: v1.46
4040

4141
cross:
4242
runs-on: ubuntu-20.04
4343
steps:
44-
- uses: actions/checkout@v2
45-
- name: cross
46-
run: make build-cross
44+
- uses: actions/checkout@v3
45+
- name: cross
46+
run: make build-cross
4747

4848

4949
test:
5050
strategy:
5151
fail-fast: false
5252
matrix:
53-
go-version: [1.15.x, 1.16.x, 1.17.x]
53+
go-version: [1.16.x, 1.17.x, 1.18.x]
5454
race: ["-race", ""]
5555
runs-on: ubuntu-20.04
5656
steps:
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5858

59-
- name: install go ${{ matrix.go-version }}
60-
uses: actions/setup-go@v2
61-
with:
62-
stable: '!contains(${{ matrix.go-version }}, "beta") && !contains(${{ matrix.go-version }}, "rc")'
63-
go-version: ${{ matrix.go-version }}
59+
- name: install go ${{ matrix.go-version }}
60+
uses: actions/setup-go@v2
61+
with:
62+
stable: '!contains(${{ matrix.go-version }}, "beta") && !contains(${{ matrix.go-version }}, "rc")'
63+
go-version: ${{ matrix.go-version }}
6464

65-
- name: build
66-
run: make BUILDFLAGS="${{ matrix.race }}" build
65+
- name: build
66+
run: make BUILDFLAGS="${{ matrix.race }}" build
6767

68-
- name: test
69-
run: make TESTFLAGS="${{ matrix.race }}" test
68+
- name: test
69+
run: make TESTFLAGS="${{ matrix.race }}" test

go-selinux/doc.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ Usage:
99
if selinux.EnforceMode() != selinux.Enforcing {
1010
selinux.SetEnforceMode(selinux.Enforcing)
1111
}
12-
1312
*/
1413
package selinux

go-selinux/label/label_stub.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package label

go-selinux/label/label_stub_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package label

go-selinux/rchcon.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux && go1.16
12
// +build linux,go1.16
23

34
package selinux

go-selinux/rchcon_go115.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build linux && !go1.16
12
// +build linux,!go1.16
23

34
package selinux

go-selinux/selinux_stub.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package selinux

go-selinux/selinux_stub_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
//go:build !linux
12
// +build !linux
23

34
package selinux

0 commit comments

Comments
 (0)