Skip to content

Commit fc69fe9

Browse files
authored
feat(deps): upgrade minimum Go version to 1.18 (from 1.15) (#2)
1 parent d03cbac commit fc69fe9

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

.github/workflows/ci.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: golangci-lint
1212
uses: golangci/golangci-lint-action@v2
1313
with:
14-
version: v1.44
14+
version: v1.54
1515
env:
1616
VERBOSE: "true"
1717

@@ -22,7 +22,7 @@ jobs:
2222
- uses: actions/checkout@v2
2323
- uses: actions/setup-go@v2
2424
with:
25-
go-version: 1.15
25+
go-version: 1.18
2626
- uses: actions/cache@v2
2727
with:
2828
path: ~/go/pkg/mod
@@ -39,7 +39,7 @@ jobs:
3939
- uses: actions/checkout@v2
4040
- uses: actions/setup-go@v2
4141
with:
42-
go-version: 1.16
42+
go-version: 1.18
4343
- uses: actions/cache@v2
4444
with:
4545
path: ~/go/pkg/mod
@@ -64,9 +64,10 @@ jobs:
6464
fail-fast: false
6565
matrix:
6666
go_version:
67-
- "1.15"
68-
- "1.16"
69-
- "1.17"
67+
- "1.18"
68+
- "1.19"
69+
- "1.20"
70+
- "1.21"
7071
runs-on: ubuntu-latest
7172
steps:
7273
- uses: actions/checkout@v2

.golangci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ linters:
2424
enable:
2525
- asciicheck
2626
- bodyclose
27-
- deadcode
28-
- depguard
2927
- durationcheck
3028
- errcheck
3129
- errorlint
@@ -58,13 +56,11 @@ linters:
5856
- rowserrcheck
5957
- sqlclosecheck
6058
- staticcheck
61-
- structcheck
6259
- tparallel
6360
- typecheck
6461
- unconvert
6562
- unparam
6663
- unused
67-
- varcheck
6864
- wastedassign
6965
- whitespace
7066

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ endef
4949
$(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc))
5050
$(eval $(call tool,gofumpt,mvdan.cc/gofumpt))
5151
$(eval $(call tool,goimports,golang.org/x/tools/cmd/goimports))
52-
$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.44))
52+
$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.54))
5353
$(eval $(call tool,gomod,github.com/Helcaraxan/gomod))
5454

5555
.PHONY: tools

go.mod

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
module github.com/romdo/gomockctx
22

3-
go 1.15
3+
go 1.18
44

55
require (
6-
github.com/davecgh/go-spew v1.1.1 // indirect
76
github.com/golang/mock v1.6.0
87
github.com/stretchr/testify v1.7.0
8+
)
9+
10+
require (
11+
github.com/davecgh/go-spew v1.1.1 // indirect
12+
github.com/pmezard/go-difflib v1.0.0 // indirect
913
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
1014
)

0 commit comments

Comments
 (0)