Skip to content

Commit 5d0144a

Browse files
committed
Update and test with Go v1.21 and v1.20
1 parent 646c1a0 commit 5d0144a

File tree

4 files changed

+17
-23
lines changed

4 files changed

+17
-23
lines changed

.github/workflows/reports.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- master
66
pull_request:
7-
types: [opened, synchronize, reopened]
7+
types: [ opened, synchronize, reopened ]
88
permissions:
99
contents: read
1010
jobs:
@@ -13,17 +13,17 @@ jobs:
1313
runs-on: ubuntu-latest
1414
strategy:
1515
matrix:
16-
go: [ '1.19', '1.18', '1.17' ]
16+
go: [ '1.21', '1.20', '1.19', '1.18', '1.17' ]
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Setup Go
20-
uses: actions/setup-go@v3
20+
uses: actions/setup-go@v4
2121
with:
2222
go-version: ${{ matrix.go }}
2323
- name: golangci-lint
2424
uses: golangci/golangci-lint-action@v3
2525
with:
26-
version: v1.50.1
26+
version: v1.54.2
2727
- name: Run Unit Tests
2828
run: ./test.sh
2929
- name: Send coverage

.golangci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,9 @@ linters-settings:
55
min-confidence: 0
66
gocyclo:
77
min-complexity: 15
8-
maligned:
9-
suggest-new: true
108
goconst:
11-
min-len: 2
12-
min-occurrences: 2
9+
min-len: 3
10+
min-occurrences: 3
1311
misspell:
1412
locale: US
1513
lll:
@@ -35,7 +33,6 @@ linters: # don't use --enable-all
3533
disable-all: true
3634
enable:
3735
- bodyclose
38-
- deadcode
3936
- depguard
4037
- dogsled
4138
- dupl
@@ -47,29 +44,24 @@ linters: # don't use --enable-all
4744
- gocyclo
4845
- gofmt
4946
- goimports
50-
- golint
5147
- gosec
5248
- gosimple
5349
- govet
5450
- ineffassign
55-
- interfacer
5651
- lll
5752
- misspell
5853
- nakedret
59-
- scopelint
54+
- revive
6055
- staticcheck
61-
- structcheck
6256
- stylecheck
6357
- typecheck
6458
- unconvert
6559
- unparam
6660
- unused
67-
- varcheck
6861
- whitespace
69-
- maligned
70-
62+
fast: true
7163
run:
7264
skip-dirs:
73-
- vendor/
65+
- "./*vendor"
7466
skip-files:
7567
- ./*_test.go

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ module github.com/simukti/sqldb-logger
22

33
go 1.17
44

5-
require github.com/stretchr/testify v1.8.1
5+
require github.com/stretchr/testify v1.8.4
66

77
require (
88
github.com/davecgh/go-spew v1.1.1 // indirect
99
github.com/kr/pretty v0.1.0 // indirect
1010
github.com/pmezard/go-difflib v1.0.0 // indirect
11-
github.com/stretchr/objx v0.5.0 // indirect
11+
github.com/stretchr/objx v0.5.1 // indirect
1212
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
1313
gopkg.in/yaml.v3 v3.0.1 // indirect
1414
)

go.sum

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
1010
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1111
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
1212
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
13-
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
1413
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
14+
github.com/stretchr/objx v0.5.1 h1:4VhoImhV/Bm0ToFkXFi8hXNXwpDRZ/ynw3amt82mzq0=
15+
github.com/stretchr/objx v0.5.1/go.mod h1:/iHQpkQwBD6DLUmQ4pE+s1TXdob1mORJ4/UFdrifcy0=
1516
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
1617
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
17-
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
18-
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
18+
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
19+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
20+
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
1921
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2022
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
2123
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)