From 3a33ba12ad9a436792c1e89a3732f8600940f6e6 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Sat, 29 Mar 2025 20:42:18 -0700 Subject: [PATCH 1/2] Fix golangci-lint config There was a typo and non-existent config option in the linter config. Because we don't verify the config it's easy to miss it. Signed-off-by: Milos Gajdos --- .golangci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 823cc43de..0f4d6ce0e 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -23,6 +23,5 @@ linters-settings: disabled: true issues: - deadline: 2m - exlude-dirs: + exclude-dirs: - vendor From fd14cf193339eb2300828363560884f4ccbadba3 Mon Sep 17 00:00:00 2001 From: Milos Gajdos Date: Sun, 30 Mar 2025 07:17:22 -0700 Subject: [PATCH 2/2] Vrify the linter config first before running it Signed-off-by: Milos Gajdos --- dockerfiles/lint.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockerfiles/lint.Dockerfile b/dockerfiles/lint.Dockerfile index 14be8be82..62eea27ba 100644 --- a/dockerfiles/lint.Dockerfile +++ b/dockerfiles/lint.Dockerfile @@ -18,4 +18,5 @@ ARG BUILDTAGS RUN --mount=type=bind,target=. \ --mount=type=cache,target=/root/.cache \ --mount=from=golangci-lint,source=/usr/bin/golangci-lint,target=/usr/bin/golangci-lint \ - golangci-lint --timeout "${TIMEOUT}" --build-tags "${BUILDTAGS}" run + golangci-lint config verify && \ + golangci-lint --timeout "${TIMEOUT}" --build-tags "${BUILDTAGS}" run \ No newline at end of file