diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8d80c8a..b1f6df8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: - version: v1.44 + version: v1.54 env: VERBOSE: "true" @@ -22,7 +22,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.15 + go-version: 1.18 - uses: actions/cache@v2 with: path: ~/go/pkg/mod @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.18 - uses: actions/cache@v2 with: path: ~/go/pkg/mod @@ -64,9 +64,10 @@ jobs: fail-fast: false matrix: go_version: - - "1.15" - - "1.16" - - "1.17" + - "1.18" + - "1.19" + - "1.20" + - "1.21" runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 diff --git a/.golangci.yml b/.golangci.yml index bee01fe..e6ae811 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -24,8 +24,6 @@ linters: enable: - asciicheck - bodyclose - - deadcode - - depguard - durationcheck - errcheck - errorlint @@ -58,13 +56,11 @@ linters: - rowserrcheck - sqlclosecheck - staticcheck - - structcheck - tparallel - typecheck - unconvert - unparam - unused - - varcheck - wastedassign - whitespace diff --git a/Makefile b/Makefile index 48c8b3c..946b2e3 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ endef $(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc)) $(eval $(call tool,gofumpt,mvdan.cc/gofumpt)) $(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports)) -$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44)) +$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54)) $(eval $(call tool,gomod,github.com/Helcaraxan/gomod)) .PHONY: tools diff --git a/go.mod b/go.mod index 5285db3..9e0edde 100644 --- a/go.mod +++ b/go.mod @@ -1,10 +1,14 @@ module github.com/romdo/gomockctx -go 1.15 +go 1.18 require ( - github.com/davecgh/go-spew v1.1.1 // indirect github.com/golang/mock v1.6.0 github.com/stretchr/testify v1.7.0 +) + +require ( + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect )