Skip to content

Commit dfc6dbf

Browse files
committed
feat: Add golangci-lint-v2
Keep golangci-lint in the image to avoid breaking backwards compatibility with existing users. Add golangci-lint-v2 to create an upgrade path. Signed-off-by: Marcelo E. Magallon <marcelo.magallon@grafana.com>
1 parent 494e746 commit dfc6dbf

File tree

3 files changed

+15
-2
lines changed

3 files changed

+15
-2
lines changed

Dockerfile.build.tmpl

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,13 @@ FROM go AS golangci_lint
131131

132132
RUN env GOPATH=/build GOOS=${TARGET_GOOS} GOARCH=${TARGET_GOARCH} go install github.com/golangci/golangci-lint/cmd/golangci-lint@{{ .data.golangci_lint }}
133133

134+
FROM go AS golangci_lint_v2
135+
ARG TARGET_GOOS
136+
ARG TARGET_GOARCH
137+
138+
RUN env GOPATH=/build GOOS=${TARGET_GOOS} GOARCH=${TARGET_GOARCH} go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@{{ .data.golangci_lint_v2 }} && \
139+
mv /build/bin/golangci-lint /build/bin/golangci-lint-v2
140+
134141
FROM go AS gomplate
135142
ARG TARGET_GOOS
136143
ARG TARGET_GOARCH
@@ -234,7 +241,9 @@ FROM docker.io/library/debian:stable-slim AS final
234241
COPY --from=go_jsonnet /build/bin/* /dist/
235242

236243
COPY --from=golangci_lint /build/bin/* /dist/
237-
244+
245+
COPY --from=golangci_lint_v2 /build/bin/* /dist/
246+
238247
COPY --from=gomplate /build/bin/* /dist/
239248

240249
COPY --from=gotestsum /build/bin/* /dist/

lib/image-test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ grr --version
8181
echo '=== golangci-lint'
8282
golangci-lint version
8383

84+
echo '=== golangci-lint-v2'
85+
golangci-lint-v2 version
86+
8487
echo '=== gomplate'
8588
gomplate --version
8689

versions.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ gh: v2.60.1
3232
git_chglog: v0.15.4
3333
# renovate: datasource=docker depName=go packageName=golang
3434
go: 1.24.4 # sha256:db5d0afbfb4ab648af2393b92e87eaae9ad5e01132803d80caef91b5752d289c
35-
# renovate: datasource=github-releases depName=golangci-lint packageName=golangci/golangci-lint
3635
golangci_lint: v1.64.8
36+
# renovate: datasource=github-releases depName=golangci-lint packageName=golangci/golangci-lint
37+
golangci_lint_v2: v2.1.6
3738
# renovate: datasource=github-releases depName=gomplate packageName=hairyhenderson/gomplate
3839
gomplate: v4.3.2
3940
# renovate: datasource=github-releases depName=gotest.tools/gotestsum packageName=gotestyourself/gotestsum

0 commit comments

Comments
 (0)