Skip to content

Commit

Permalink
Merge pull request #179 from thaJeztah/update_golangci_lint
Browse files Browse the repository at this point in the history
gha: update golangci-lint to v1.46, add Go 1.18, remove Go 1.15
  • Loading branch information
rhatdan committed Jul 19, 2022
2 parents b730778 + 03ab91c commit 85331a8
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 21 deletions.
40 changes: 20 additions & 20 deletions .github/workflows/validate.yml
Expand Up @@ -30,40 +30,40 @@ jobs:
lint:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: golangci/golangci-lint-action@v2
- uses: actions/checkout@v3
- uses: actions/setup-go@v2
with:
# must be specified without patch version
version: v1.36
# Only show new issues for a pull request.
only-new-issues: true
go-version: 1.18.x
- uses: golangci/golangci-lint-action@v3
with:
version: v1.46

cross:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- name: cross
run: make build-cross
- uses: actions/checkout@v3
- name: cross
run: make build-cross


test:
strategy:
fail-fast: false
matrix:
go-version: [1.15.x, 1.16.x, 1.17.x]
go-version: [1.16.x, 1.17.x, 1.18.x]
race: ["-race", ""]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

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

- name: build
run: make BUILDFLAGS="${{ matrix.race }}" build
- name: build
run: make BUILDFLAGS="${{ matrix.race }}" build

- name: test
run: make TESTFLAGS="${{ matrix.race }}" test
- name: test
run: make TESTFLAGS="${{ matrix.race }}" test
1 change: 0 additions & 1 deletion go-selinux/doc.go
Expand Up @@ -9,6 +9,5 @@ Usage:
if selinux.EnforceMode() != selinux.Enforcing {
selinux.SetEnforceMode(selinux.Enforcing)
}
*/
package selinux
1 change: 1 addition & 0 deletions go-selinux/label/label_stub.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

package label
Expand Down
1 change: 1 addition & 0 deletions go-selinux/label/label_stub_test.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

package label
Expand Down
1 change: 1 addition & 0 deletions go-selinux/rchcon.go
@@ -1,3 +1,4 @@
//go:build linux && go1.16
// +build linux,go1.16

package selinux
Expand Down
1 change: 1 addition & 0 deletions go-selinux/rchcon_go115.go
@@ -1,3 +1,4 @@
//go:build linux && !go1.16
// +build linux,!go1.16

package selinux
Expand Down
1 change: 1 addition & 0 deletions go-selinux/selinux_stub.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

package selinux
Expand Down
1 change: 1 addition & 0 deletions go-selinux/selinux_stub_test.go
@@ -1,3 +1,4 @@
//go:build !linux
// +build !linux

package selinux
Expand Down

0 comments on commit 85331a8

Please sign in to comment.