Skip to content

Commit 60e2d5e

Browse files
dricrossdricross
committed
Install golangci-lint from binary
1 parent 47895af commit 60e2d5e

File tree

4 files changed

+12
-619
lines changed

4 files changed

+12
-619
lines changed

‎Makefile.Common‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,23 @@ CHLOGGEN_CONFIG := .chloggen/config.yaml
5050
JUNIT_OUT_DIR ?= $(TOOLS_MOD_DIR)/testresults
5151

5252
.PHONY: install-tools
53-
install-tools: $(TOOLS_BIN_NAMES)
53+
install-tools: $(TOOLS_BIN_NAMES) $(TOOLS_BIN_DIR)/golangci-lint
5454

5555
$(TOOLS_BIN_DIR):
5656
mkdir -p $@
5757

5858
$(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod
5959
cd $(TOOLS_MOD_DIR) && GOOS="" GOARCH="" $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES))
6060

61+
$(TOOLS_BIN_DIR)/golangci-lint: $(TOOLS_BIN_DIR)
62+
@(\
63+
flock -x 200; \
64+
if [ ! -f $@ ]; then \
65+
echo "Downloading golangci-lint..."; \
66+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/HEAD/install.sh | sh -s -- -b $(TOOLS_BIN_DIR) v2.1.1; \
67+
fi \
68+
) 200>[email protected]
69+
6170
ADDLICENSE := $(TOOLS_BIN_DIR)/addlicense
6271
MDLINKCHECK := $(TOOLS_BIN_DIR)/markdown-link-check
6372
MISSPELL := $(TOOLS_BIN_DIR)/misspell -error
@@ -211,7 +220,7 @@ fmt: $(GOFUMPT) $(GOIMPORTS)
211220
$(GOIMPORTS) -w -local github.com/open-telemetry/opentelemetry-collector-contrib ./
212221

213222
.PHONY: lint
214-
lint: $(LINT) checklicense misspell
223+
lint: $(LINT) checklicense misspell
215224
$(LINT) run
216225

217226
.PHONY: govulncheck

‎internal/tools/go.mod‎

Lines changed: 1 addition & 162 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/Khan/genqlient v0.8.0
77
github.com/client9/misspell v0.3.4
88
github.com/daixiang0/gci v0.13.6
9-
github.com/golangci/golangci-lint/v2 v2.1.1
109
github.com/google/addlicense v1.1.1
1110
github.com/jcchavezs/porto v0.6.0
1211
github.com/jstemmer/go-junit-report v1.0.0
@@ -27,225 +26,69 @@ require (
2726
)
2827

2928
require (
30-
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
31-
4d63.com/gochecknoglobals v0.2.2 // indirect
3229
dario.cat/mergo v1.0.0 // indirect
33-
github.com/4meepo/tagalign v1.4.2 // indirect
34-
github.com/Abirdcfly/dupword v0.1.3 // indirect
35-
github.com/Antonboom/errname v1.1.0 // indirect
36-
github.com/Antonboom/nilnil v1.1.0 // indirect
37-
github.com/Antonboom/testifylint v1.6.1 // indirect
38-
github.com/BurntSushi/toml v1.5.0 // indirect
39-
github.com/Crocmagnon/fatcontext v0.7.2 // indirect
40-
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
41-
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
42-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4330
github.com/Microsoft/go-winio v0.6.2 // indirect
44-
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
4531
github.com/ProtonMail/go-crypto v1.1.5 // indirect
4632
github.com/agnivade/levenshtein v1.1.1 // indirect
47-
github.com/alecthomas/chroma/v2 v2.16.0 // indirect
48-
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
4933
github.com/alexflint/go-arg v1.5.0 // indirect
5034
github.com/alexflint/go-scalar v1.2.0 // indirect
51-
github.com/alexkohler/nakedret/v2 v2.0.6 // indirect
52-
github.com/alexkohler/prealloc v1.0.0 // indirect
53-
github.com/alingse/asasalint v0.0.11 // indirect
54-
github.com/alingse/nilnesserr v0.2.0 // indirect
55-
github.com/ashanbrown/forbidigo v1.6.0 // indirect
56-
github.com/ashanbrown/makezero v1.2.0 // indirect
57-
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
58-
github.com/beorn7/perks v1.0.1 // indirect
5935
github.com/bitfield/gotestdox v0.2.2 // indirect
60-
github.com/bkielbasa/cyclop v1.2.3 // indirect
61-
github.com/blizzy78/varnamelen v0.8.0 // indirect
6236
github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
63-
github.com/bombsimon/wsl/v4 v4.7.0 // indirect
64-
github.com/breml/bidichk v0.3.3 // indirect
65-
github.com/breml/errchkjson v0.4.1 // indirect
66-
github.com/butuzov/ireturn v0.4.0 // indirect
67-
github.com/butuzov/mirror v1.3.0 // indirect
68-
github.com/catenacyber/perfsprint v0.9.1 // indirect
69-
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
70-
github.com/cespare/xxhash/v2 v2.3.0 // indirect
71-
github.com/charithe/durationcheck v0.0.10 // indirect
72-
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
73-
github.com/charmbracelet/lipgloss v1.1.0 // indirect
74-
github.com/charmbracelet/x/ansi v0.8.0 // indirect
75-
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
76-
github.com/charmbracelet/x/term v0.2.1 // indirect
77-
github.com/chavacava/garif v0.1.0 // indirect
78-
github.com/ckaznocha/intrange v0.3.1 // indirect
7937
github.com/cloudflare/circl v1.6.0 // indirect
80-
github.com/curioswitch/go-reassign v0.3.0 // indirect
8138
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
82-
github.com/dave/dst v0.27.3 // indirect
83-
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
84-
github.com/denis-tingaikin/go-header v0.5.0 // indirect
85-
github.com/dlclark/regexp2 v1.11.5 // indirect
8639
github.com/dnephin/pflag v1.0.7 // indirect
8740
github.com/emirpasic/gods v1.18.1 // indirect
88-
github.com/ettle/strcase v0.2.0 // indirect
8941
github.com/fatih/color v1.18.0 // indirect
90-
github.com/fatih/structtag v1.2.0 // indirect
91-
github.com/firefart/nonamedreturns v1.0.6 // indirect
9242
github.com/fsnotify/fsnotify v1.8.0 // indirect
93-
github.com/fzipp/gocyclo v0.6.0 // indirect
94-
github.com/ghostiam/protogetter v0.3.13 // indirect
95-
github.com/go-critic/go-critic v0.13.0 // indirect
9643
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
9744
github.com/go-git/go-billy/v5 v5.6.2 // indirect
9845
github.com/go-git/go-git/v5 v5.14.0 // indirect
9946
github.com/go-logr/logr v1.4.2 // indirect
10047
github.com/go-logr/stdr v1.2.2 // indirect
101-
github.com/go-toolsmith/astcast v1.1.0 // indirect
102-
github.com/go-toolsmith/astcopy v1.1.0 // indirect
103-
github.com/go-toolsmith/astequal v1.2.0 // indirect
104-
github.com/go-toolsmith/astfmt v1.1.0 // indirect
105-
github.com/go-toolsmith/astp v1.1.0 // indirect
106-
github.com/go-toolsmith/strparse v1.1.0 // indirect
107-
github.com/go-toolsmith/typep v1.1.0 // indirect
10848
github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
109-
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
110-
github.com/gobwas/glob v0.2.3 // indirect
111-
github.com/gofrs/flock v0.12.1 // indirect
11249
github.com/gogo/protobuf v1.3.2 // indirect
11350
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
114-
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
115-
github.com/golangci/go-printf-func-name v0.1.0 // indirect
116-
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
117-
github.com/golangci/golines v0.0.0-20250217134842-442fd0091d95 // indirect
118-
github.com/golangci/misspell v0.6.0 // indirect
119-
github.com/golangci/plugin-module-register v0.1.1 // indirect
120-
github.com/golangci/revgrep v0.8.0 // indirect
121-
github.com/golangci/unconvert v0.0.0-20250410112200-a129a6e6413e // indirect
12251
github.com/google/go-cmp v0.7.0 // indirect
12352
github.com/google/go-github v17.0.0+incompatible // indirect
12453
github.com/google/go-github/v66 v66.0.0 // indirect
12554
github.com/google/go-querystring v1.1.0 // indirect
12655
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
12756
github.com/google/uuid v1.6.0 // indirect
128-
github.com/gordonklaus/ineffassign v0.1.0 // indirect
129-
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
130-
github.com/gostaticanalysis/comment v1.5.0 // indirect
131-
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
132-
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
133-
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
13457
github.com/hashicorp/go-version v1.7.0 // indirect
135-
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
13658
github.com/hexops/gotextdiff v1.0.3 // indirect
13759
github.com/inconshreveable/mousetrap v1.1.0 // indirect
13860
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
139-
github.com/jgautheron/goconst v1.8.1 // indirect
140-
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
141-
github.com/jjti/go-spancheck v0.6.4 // indirect
14261
github.com/joshdk/go-junit v1.0.0 // indirect
14362
github.com/json-iterator/go v1.1.12 // indirect
144-
github.com/julz/importas v0.2.0 // indirect
145-
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
14663
github.com/kevinburke/ssh_config v1.2.0 // indirect
147-
github.com/kisielk/errcheck v1.9.0 // indirect
148-
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
14964
github.com/knadh/koanf/maps v0.1.2 // indirect
15065
github.com/knadh/koanf/parsers/yaml v0.1.0 // indirect
15166
github.com/knadh/koanf/providers/confmap v0.1.0 // indirect
15267
github.com/knadh/koanf/providers/env v1.0.0 // indirect
15368
github.com/knadh/koanf/providers/file v1.1.2 // indirect
15469
github.com/knadh/koanf/providers/fs v0.1.0 // indirect
15570
github.com/knadh/koanf/v2 v2.1.2 // indirect
156-
github.com/kulti/thelper v0.6.3 // indirect
157-
github.com/kunwardeep/paralleltest v1.0.14 // indirect
158-
github.com/lasiar/canonicalheader v1.1.2 // indirect
159-
github.com/ldez/exptostd v0.4.2 // indirect
160-
github.com/ldez/gomoddirectives v0.6.1 // indirect
161-
github.com/ldez/grignotin v0.9.0 // indirect
162-
github.com/ldez/tagliatelle v0.7.1 // indirect
163-
github.com/ldez/usetesting v0.4.2 // indirect
164-
github.com/leonklingele/grouper v1.1.2 // indirect
165-
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
166-
github.com/macabu/inamedparam v0.2.0 // indirect
167-
github.com/manuelarte/funcorder v0.2.1 // indirect
168-
github.com/maratori/testableexamples v1.0.0 // indirect
169-
github.com/maratori/testpackage v1.1.1 // indirect
170-
github.com/matoous/godox v1.1.0 // indirect
17171
github.com/mattn/go-colorable v0.1.14 // indirect
17272
github.com/mattn/go-isatty v0.0.20 // indirect
173-
github.com/mattn/go-runewidth v0.0.16 // indirect
174-
github.com/mgechev/revive v1.9.0 // indirect
17573
github.com/mitchellh/copystructure v1.2.0 // indirect
176-
github.com/mitchellh/go-homedir v1.1.0 // indirect
17774
github.com/mitchellh/reflectwalk v1.0.2 // indirect
17875
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
17976
github.com/modern-go/reflect2 v1.0.2 // indirect
180-
github.com/moricho/tparallel v0.3.2 // indirect
181-
github.com/muesli/termenv v0.16.0 // indirect
182-
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
183-
github.com/nakabonne/nestif v0.3.1 // indirect
184-
github.com/nishanths/exhaustive v0.12.0 // indirect
185-
github.com/nishanths/predeclared v0.2.2 // indirect
186-
github.com/nunnatsa/ginkgolinter v0.19.1 // indirect
187-
github.com/olekukonko/tablewriter v0.0.5 // indirect
77+
github.com/onsi/gomega v1.36.3 // indirect
18878
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
18979
github.com/pjbgf/sha1cd v0.3.2 // indirect
190-
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
191-
github.com/polyfloyd/go-errorlint v1.8.0 // indirect
192-
github.com/prometheus/client_golang v1.20.3 // indirect
193-
github.com/prometheus/client_model v0.6.1 // indirect
194-
github.com/prometheus/common v0.59.1 // indirect
195-
github.com/prometheus/procfs v0.15.1 // indirect
196-
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
197-
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
198-
github.com/quasilyte/gogrep v0.5.0 // indirect
199-
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
200-
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
201-
github.com/raeperd/recvcheck v0.2.0 // indirect
202-
github.com/rivo/uniseg v0.4.7 // indirect
203-
github.com/rogpeppe/go-internal v1.14.1 // indirect
204-
github.com/ryancurrah/gomodguard v1.4.1 // indirect
205-
github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
20680
github.com/sagikazarmark/locafero v0.7.0 // indirect
207-
github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
208-
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
209-
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
210-
github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
211-
github.com/securego/gosec/v2 v2.22.3 // indirect
21281
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
213-
github.com/sirupsen/logrus v1.9.3 // indirect
214-
github.com/sivchari/containedctx v1.0.3 // indirect
21582
github.com/skeema/knownhosts v1.3.1 // indirect
216-
github.com/sonatard/noctx v0.1.0 // indirect
21783
github.com/sourcegraph/conc v0.3.0 // indirect
218-
github.com/sourcegraph/go-diff v0.7.0 // indirect
21984
github.com/spf13/afero v1.14.0 // indirect
22085
github.com/spf13/cast v1.7.1 // indirect
22186
github.com/spf13/cobra v1.9.1 // indirect
22287
github.com/spf13/pflag v1.0.6 // indirect
22388
github.com/spf13/viper v1.20.0 // indirect
224-
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
225-
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
226-
github.com/stretchr/objx v0.5.2 // indirect
227-
github.com/stretchr/testify v1.10.0 // indirect
22889
github.com/subosito/gotenv v1.6.0 // indirect
229-
github.com/tdakkota/asciicheck v0.4.1 // indirect
230-
github.com/tetafro/godot v1.5.0 // indirect
231-
github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
232-
github.com/timonwong/loggercheck v0.11.0 // indirect
233-
github.com/tomarrell/wrapcheck/v2 v2.11.0 // indirect
234-
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
235-
github.com/ultraware/funlen v0.2.0 // indirect
236-
github.com/ultraware/whitespace v0.2.0 // indirect
237-
github.com/uudashr/gocognit v1.2.0 // indirect
238-
github.com/uudashr/iface v1.3.1 // indirect
23990
github.com/vektah/gqlparser/v2 v2.5.19 // indirect
24091
github.com/xanzy/ssh-agent v0.3.3 // indirect
241-
github.com/xen0n/gosmopolitan v1.3.0 // indirect
242-
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
243-
github.com/yagipy/maintidx v1.0.0 // indirect
244-
github.com/yeya24/promlinter v0.3.0 // indirect
245-
github.com/ykadowak/zerologlint v0.1.5 // indirect
246-
gitlab.com/bosi/decorder v0.4.2 // indirect
247-
go-simpler.org/musttag v0.13.0 // indirect
248-
go-simpler.org/sloglint v0.11.0 // indirect
24992
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
25093
go.opentelemetry.io/build-tools v0.21.0 // indirect
25194
go.opentelemetry.io/collector/component v1.30.0 // indirect
@@ -261,11 +104,9 @@ require (
261104
go.opentelemetry.io/otel/metric v1.35.0 // indirect
262105
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
263106
go.opentelemetry.io/otel/trace v1.35.0 // indirect
264-
go.uber.org/automaxprocs v1.6.0 // indirect
265107
go.uber.org/multierr v1.11.0 // indirect
266108
go.uber.org/zap v1.27.0 // indirect
267109
golang.org/x/crypto v0.37.0 // indirect
268-
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
269110
golang.org/x/mod v0.24.0 // indirect
270111
golang.org/x/net v0.39.0 // indirect
271112
golang.org/x/oauth2 v0.28.0 // indirect
@@ -280,8 +121,6 @@ require (
280121
gopkg.in/warnings.v0 v0.1.2 // indirect
281122
gopkg.in/yaml.v2 v2.4.0 // indirect
282123
gopkg.in/yaml.v3 v3.0.1 // indirect
283-
honnef.co/go/tools v0.6.1 // indirect
284-
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
285124
)
286125

287126
// openshift removed all tags from their repo, use the pseudoversion from the release-3.9 branch HEAD

0 commit comments

Comments
 (0)