Skip to content

Commit 539868d

Browse files
guggeroguggero
committed
tools+make: update linter
1 parent 163af3d commit 539868d

File tree

4 files changed

+203
-194
lines changed

4 files changed

+203
-194
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ all: scratch check install
9696

9797
$(GOACC_BIN):
9898
@$(call print, "Installing go-acc.")
99-
cd $(TOOLS_DIR); go install -trimpath -tags=tools $(GOACC_PKG)
99+
cd $(TOOLS_DIR); go install -trimpath $(GOACC_PKG)
100100

101101
$(GOIMPORTS_BIN):
102102
@$(call print, "Installing goimports.")

‎tools/Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ FROM golang:1.19.7-buster
33
RUN apt-get update && apt-get install -y git
44
ENV GOCACHE=/tmp/build/.cache
55
ENV GOMODCACHE=/tmp/build/.modcache
6+
ENV GOFLAGS="-buildvcs=false"
67

78
COPY . /tmp/tools
89

910
RUN cd /tmp \
1011
&& mkdir -p /tmp/build/.cache \
1112
&& mkdir -p /tmp/build/.modcache \
1213
&& cd /tmp/tools \
13-
&& go install -trimpath -tags=tools github.com/golangci/golangci-lint/cmd/golangci-lint \
14-
&& chmod -R 777 /tmp/build/ \
15-
&& git config --global --add safe.directory /build
14+
&& go install -trimpath github.com/golangci/golangci-lint/cmd/golangci-lint \
15+
&& chmod -R 777 /tmp/build/
1616

1717
WORKDIR /build

‎tools/go.mod‎

Lines changed: 58 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,31 @@ go 1.19
44

55
require (
66
github.com/btcsuite/btcd v0.23.2
7-
github.com/golangci/golangci-lint v1.50.0
7+
github.com/golangci/golangci-lint v1.51.2
88
github.com/ory/go-acc v0.2.8
99
github.com/rinchsan/gosimports v0.3.2
1010
)
1111

1212
require (
13-
4d63.com/gochecknoglobals v0.1.0 // indirect
14-
github.com/Abirdcfly/dupword v0.0.7 // indirect
13+
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
14+
4d63.com/gochecknoglobals v0.2.1 // indirect
15+
github.com/Abirdcfly/dupword v0.0.9 // indirect
1516
github.com/Antonboom/errname v0.1.7 // indirect
1617
github.com/Antonboom/nilnil v0.1.1 // indirect
17-
github.com/BurntSushi/toml v1.2.0 // indirect
18+
github.com/BurntSushi/toml v1.2.1 // indirect
1819
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
1920
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
2021
github.com/Masterminds/semver v1.5.0 // indirect
2122
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
2223
github.com/aead/siphash v1.0.1 // indirect
2324
github.com/alexkohler/prealloc v1.0.0 // indirect
2425
github.com/alingse/asasalint v0.0.11 // indirect
25-
github.com/ashanbrown/forbidigo v1.3.0 // indirect
26+
github.com/ashanbrown/forbidigo v1.4.0 // indirect
2627
github.com/ashanbrown/makezero v1.1.1 // indirect
2728
github.com/beorn7/perks v1.0.1 // indirect
2829
github.com/bkielbasa/cyclop v1.2.0 // indirect
2930
github.com/blizzy78/varnamelen v0.8.0 // indirect
30-
github.com/bombsimon/wsl/v3 v3.3.0 // indirect
31+
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
3132
github.com/breml/bidichk v0.2.3 // indirect
3233
github.com/breml/errchkjson v0.3.0 // indirect
3334
github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
@@ -41,9 +42,9 @@ require (
4142
github.com/cespare/xxhash v1.1.0 // indirect
4243
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4344
github.com/charithe/durationcheck v0.0.9 // indirect
44-
github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect
45+
github.com/chavacava/garif v0.0.0-20221024190013-b3ef35877348 // indirect
4546
github.com/curioswitch/go-reassign v0.2.0 // indirect
46-
github.com/daixiang0/gci v0.8.0 // indirect
47+
github.com/daixiang0/gci v0.9.1 // indirect
4748
github.com/davecgh/go-spew v1.1.1 // indirect
4849
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
4950
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect
@@ -52,20 +53,20 @@ require (
5253
github.com/dgraph-io/ristretto v0.0.2 // indirect
5354
github.com/esimonov/ifshort v1.0.4 // indirect
5455
github.com/ettle/strcase v0.1.1 // indirect
55-
github.com/fatih/color v1.13.0 // indirect
56+
github.com/fatih/color v1.14.1 // indirect
5657
github.com/fatih/structtag v1.2.0 // indirect
5758
github.com/firefart/nonamedreturns v1.0.4 // indirect
5859
github.com/fsnotify/fsnotify v1.5.4 // indirect
5960
github.com/fzipp/gocyclo v0.6.0 // indirect
60-
github.com/go-critic/go-critic v0.6.5 // indirect
61-
github.com/go-toolsmith/astcast v1.0.0 // indirect
62-
github.com/go-toolsmith/astcopy v1.0.2 // indirect
63-
github.com/go-toolsmith/astequal v1.0.3 // indirect
64-
github.com/go-toolsmith/astfmt v1.0.0 // indirect
65-
github.com/go-toolsmith/astp v1.0.0 // indirect
66-
github.com/go-toolsmith/strparse v1.0.0 // indirect
67-
github.com/go-toolsmith/typep v1.0.2 // indirect
68-
github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
61+
github.com/go-critic/go-critic v0.6.7 // indirect
62+
github.com/go-toolsmith/astcast v1.1.0 // indirect
63+
github.com/go-toolsmith/astcopy v1.0.3 // indirect
64+
github.com/go-toolsmith/astequal v1.1.0 // indirect
65+
github.com/go-toolsmith/astfmt v1.1.0 // indirect
66+
github.com/go-toolsmith/astp v1.1.0 // indirect
67+
github.com/go-toolsmith/strparse v1.1.0 // indirect
68+
github.com/go-toolsmith/typep v1.1.0 // indirect
69+
github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
6970
github.com/gobwas/glob v0.2.3 // indirect
7071
github.com/gofrs/flock v0.8.1 // indirect
7172
github.com/golang/protobuf v1.5.2 // indirect
@@ -76,12 +77,12 @@ require (
7677
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
7778
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
7879
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
79-
github.com/golangci/misspell v0.3.5 // indirect
80+
github.com/golangci/misspell v0.4.0 // indirect
8081
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
8182
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
8283
github.com/google/go-cmp v0.5.9 // indirect
8384
github.com/google/uuid v1.3.0 // indirect
84-
github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
85+
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
8586
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
8687
github.com/gostaticanalysis/comment v1.4.2 // indirect
8788
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
@@ -91,89 +92,91 @@ require (
9192
github.com/hashicorp/go-version v1.6.0 // indirect
9293
github.com/hashicorp/hcl v1.0.0 // indirect
9394
github.com/hexops/gotextdiff v1.0.3 // indirect
94-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
95+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
9596
github.com/jessevdk/go-flags v1.4.0 // indirect
9697
github.com/jgautheron/goconst v1.5.1 // indirect
9798
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
9899
github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect
99100
github.com/jrick/logrotate v1.0.0 // indirect
100101
github.com/julz/importas v0.1.0 // indirect
101-
github.com/kisielk/errcheck v1.6.2 // indirect
102+
github.com/junk1tm/musttag v0.4.5 // indirect
103+
github.com/kisielk/errcheck v1.6.3 // indirect
102104
github.com/kisielk/gotool v1.0.0 // indirect
103-
github.com/kkHAIKE/contextcheck v1.1.2 // indirect
105+
github.com/kkHAIKE/contextcheck v1.1.3 // indirect
104106
github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23 // indirect
105107
github.com/kulti/thelper v0.6.3 // indirect
106108
github.com/kunwardeep/paralleltest v1.0.6 // indirect
107-
github.com/kyoh86/exportloopref v0.1.8 // indirect
109+
github.com/kyoh86/exportloopref v0.1.11 // indirect
108110
github.com/ldez/gomoddirectives v0.2.3 // indirect
109-
github.com/ldez/tagliatelle v0.3.1 // indirect
110-
github.com/leonklingele/grouper v1.1.0 // indirect
111+
github.com/ldez/tagliatelle v0.4.0 // indirect
112+
github.com/leonklingele/grouper v1.1.1 // indirect
111113
github.com/lufeee/execinquery v1.2.1 // indirect
112114
github.com/magiconair/properties v1.8.6 // indirect
113115
github.com/maratori/testableexamples v1.0.0 // indirect
114116
github.com/maratori/testpackage v1.1.0 // indirect
115117
github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
116118
github.com/mattn/go-colorable v0.1.13 // indirect
117-
github.com/mattn/go-isatty v0.0.16 // indirect
119+
github.com/mattn/go-isatty v0.0.17 // indirect
118120
github.com/mattn/go-runewidth v0.0.9 // indirect
119121
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
120122
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
121-
github.com/mgechev/revive v1.2.4 // indirect
123+
github.com/mgechev/revive v1.2.5 // indirect
122124
github.com/mitchellh/go-homedir v1.1.0 // indirect
123125
github.com/mitchellh/mapstructure v1.5.0 // indirect
124126
github.com/moricho/tparallel v0.2.1 // indirect
125127
github.com/nakabonne/nestif v0.3.1 // indirect
126128
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
127-
github.com/nishanths/exhaustive v0.8.3 // indirect
129+
github.com/nishanths/exhaustive v0.9.5 // indirect
128130
github.com/nishanths/predeclared v0.2.2 // indirect
131+
github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
129132
github.com/olekukonko/tablewriter v0.0.5 // indirect
130133
github.com/ory/viper v1.7.5 // indirect
131134
github.com/pborman/uuid v1.2.0 // indirect
132135
github.com/pelletier/go-toml v1.9.5 // indirect
133136
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
134-
github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect
135137
github.com/pkg/errors v0.9.1 // indirect
136138
github.com/pmezard/go-difflib v1.0.0 // indirect
137-
github.com/polyfloyd/go-errorlint v1.0.5 // indirect
139+
github.com/polyfloyd/go-errorlint v1.1.0 // indirect
138140
github.com/prometheus/client_golang v1.12.1 // indirect
139141
github.com/prometheus/client_model v0.2.0 // indirect
140142
github.com/prometheus/common v0.32.1 // indirect
141143
github.com/prometheus/procfs v0.7.3 // indirect
142-
github.com/quasilyte/go-ruleguard v0.3.18 // indirect
143-
github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
144+
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
145+
github.com/quasilyte/gogrep v0.5.0 // indirect
144146
github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
145147
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
146-
github.com/ryancurrah/gomodguard v1.2.4 // indirect
147-
github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
148-
github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
148+
github.com/ryancurrah/gomodguard v1.3.0 // indirect
149+
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
150+
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
149151
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
150-
github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
151-
github.com/securego/gosec/v2 v2.13.1 // indirect
152+
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
153+
github.com/securego/gosec/v2 v2.15.0 // indirect
152154
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
153155
github.com/sirupsen/logrus v1.9.0 // indirect
154156
github.com/sivchari/containedctx v1.0.2 // indirect
155157
github.com/sivchari/nosnakecase v1.7.0 // indirect
156-
github.com/sivchari/tenv v1.7.0 // indirect
158+
github.com/sivchari/tenv v1.7.1 // indirect
157159
github.com/sonatard/noctx v0.0.1 // indirect
158-
github.com/sourcegraph/go-diff v0.6.1 // indirect
160+
github.com/sourcegraph/go-diff v0.7.0 // indirect
159161
github.com/spf13/afero v1.8.2 // indirect
160162
github.com/spf13/cast v1.5.0 // indirect
161-
github.com/spf13/cobra v1.5.0 // indirect
163+
github.com/spf13/cobra v1.6.1 // indirect
162164
github.com/spf13/jwalterweatherman v1.1.0 // indirect
163165
github.com/spf13/pflag v1.0.5 // indirect
164166
github.com/spf13/viper v1.13.0 // indirect
165167
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
166168
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
167-
github.com/stretchr/objx v0.4.0 // indirect
168-
github.com/stretchr/testify v1.8.0 // indirect
169+
github.com/stretchr/objx v0.5.0 // indirect
170+
github.com/stretchr/testify v1.8.1 // indirect
169171
github.com/subosito/gotenv v1.4.1 // indirect
170172
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
173+
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
171174
github.com/tdakkota/asciicheck v0.1.1 // indirect
172175
github.com/tetafro/godot v1.4.11 // indirect
173-
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
176+
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
174177
github.com/timonwong/loggercheck v0.9.3 // indirect
175-
github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect
176-
github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect
178+
github.com/tomarrell/wrapcheck/v2 v2.8.0 // indirect
179+
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
177180
github.com/ultraware/funlen v0.0.3 // indirect
178181
github.com/ultraware/whitespace v0.0.5 // indirect
179182
github.com/uudashr/gocognit v1.0.6 // indirect
@@ -183,21 +186,21 @@ require (
183186
go.uber.org/atomic v1.7.0 // indirect
184187
go.uber.org/multierr v1.6.0 // indirect
185188
go.uber.org/zap v1.17.0 // indirect
186-
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
189+
golang.org/x/crypto v0.5.0 // indirect
187190
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
188-
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
189-
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
190-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
191-
golang.org/x/sys v0.0.0-20220915200043-7b5979e65e41 // indirect
192-
golang.org/x/text v0.3.8 // indirect
193-
golang.org/x/tools v0.1.12 // indirect
191+
golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 // indirect
192+
golang.org/x/mod v0.8.0 // indirect
193+
golang.org/x/sync v0.1.0 // indirect
194+
golang.org/x/sys v0.5.0 // indirect
195+
golang.org/x/text v0.6.0 // indirect
196+
golang.org/x/tools v0.6.0 // indirect
194197
google.golang.org/protobuf v1.28.0 // indirect
195198
gopkg.in/ini.v1 v1.67.0 // indirect
196199
gopkg.in/yaml.v2 v2.4.0 // indirect
197200
gopkg.in/yaml.v3 v3.0.1 // indirect
198-
honnef.co/go/tools v0.3.3 // indirect
201+
honnef.co/go/tools v0.4.2 // indirect
199202
mvdan.cc/gofumpt v0.4.0 // indirect
200203
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
201204
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
202-
mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect
205+
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect
203206
)

0 commit comments

Comments
 (0)