Skip to content

Commit

Permalink
Merge pull request #13 from Antonboom/1.20
Browse files Browse the repository at this point in the history
Move to Go 1.20
  • Loading branch information
Antonboom authored Mar 2, 2023
2 parents 89f084b + a5f993e commit feb9709
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- uses: rlespinasse/github-slug-action@v4
- uses: actions/setup-go@v2
with:
go-version: ^1.18
go-version: ^1.20
- run: cd /tmp && go install github.com/Antonboom/errname@${{ env.GITHUB_REF_NAME }} && errname -h

lint:
Expand All @@ -29,7 +29,7 @@ jobs:
steps:
- uses: actions/setup-go@v2
with:
go-version: ^1.18
go-version: ^1.20
- uses: actions/checkout@v2
- run: go test -coverprofile=coverage.out ./...
- uses: shogo82148/actions-goveralls@v1
Expand Down
11 changes: 6 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ linters-settings:
linters:
disable-all: true
enable:
- asasalint
- asciicheck
- bidichk
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
Expand All @@ -30,6 +30,7 @@ linters:
- exportloopref
- forbidigo
- gci
- gocheckcompilerdirectives
- gocognit
- goconst
- gocritic
Expand All @@ -47,7 +48,6 @@ linters:
- gosec
- gosimple
- govet
- ifshort
- importas
- ineffassign
- lll
Expand All @@ -62,19 +62,20 @@ linters:
- nosprintfhostport
- prealloc
- predeclared
- reassign
- revive
- rowserrcheck
- sqlclosecheck
- staticcheck
- structcheck
- stylecheck
- tagliatelle
- tenv
- testableexamples
- thelper
- tparallel
- typecheck
- unconvert
- unparam
- unused
- varcheck
- usestdlibvars
- wastedassign
- whitespace
6 changes: 3 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ tasks:

tools:install:
- echo "Install local tools..."
- (which gci > /dev/null) || GO111MODULE=off go get -u github.com/daixiang0/gci
- (which gofumpt > /dev/null) || GO111MODULE=off go get -u mvdan.cc/gofumpt
- (which gci > /dev/null) || GO111MODULE=off go install github.com/daixiang0/gci@latest
- (which gofumpt > /dev/null) || GO111MODULE=off go install mvdan.cc/gofumpt@latest

tidy:
cmds:
Expand All @@ -27,7 +27,7 @@ tasks:
cmds:
- echo "Fmt..."
- gofumpt -w .
- gci write -s Std -s Def -s "Prefix(github.com/Antonboom/errname)" . 2> /dev/null
- gci write -s standard -s default -s "Prefix(github.com/Antonboom/errname)" . 2> /dev/null

lint:
cmds:
Expand Down
11 changes: 4 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
module github.com/Antonboom/errname

go 1.18
go 1.20

require (
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/tools v0.1.10
golang.org/x/sys v0.5.0 // indirect
golang.org/x/tools v0.6.0
)

require (
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
)
require golang.org/x/mod v0.8.0 // indirect
15 changes: 7 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 h1:kQgndtyPBW/JIYERgdxfwMYh3AVStj88WQTlNDi2a+o=
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.1.10 h1:QjFRCZxdOhBJ/UNgnBZLbNV13DlbnK0quyivTnXJM20=
golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618=
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=

0 comments on commit feb9709

Please sign in to comment.