Skip to content

Commit 28264b4

Browse files
authored
Merge pull request moby#4928 from tonistiigi/validate-golangci-config
hack: add validation for golangci config
2 parents 6acf12f + d8c2b2d commit 28264b4

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.golangci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
run:
22
timeout: 30m
3-
skip-files:
4-
- ".*\\.pb\\.go$"
53

64
modules-download-mode: vendor
75

@@ -70,6 +68,8 @@ linters-settings:
7068
G306: "0644"
7169

7270
issues:
71+
exclude-files:
72+
- ".*\\.pb\\.go$"
7373
exclude-rules:
7474
- linters:
7575
- revive

docker-bake.hcl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ target "lint" {
147147
{ name = "labs", tags = "dfrunsecurity dfparents dfexcludepatterns", target = "golangci-lint" },
148148
{ name = "nydus", tags = "nydus", target = "golangci-lint" },
149149
{ name = "yaml", tags = "", target = "yamllint" },
150+
{ name = "golangci-verify", tags = "", target = "golangci-verify" },
150151
{ name = "proto", tags = "", target = "protolint" },
151152
{ name = "gopls", tags = "", target = "gopls-analyze" }
152153
]

hack/dockerfiles/lint.Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ RUN --mount=target=/go/src/github.com/moby/buildkit \
3131
xx-go --wrap && \
3232
golangci-lint run --build-tags "${BUILDTAGS}" && \
3333
touch /golangci-lint.done
34+
35+
36+
FROM base AS golangci-verify
37+
RUN --mount=target=/go/src/github.com/moby/buildkit \
38+
golangci-lint config verify && \
39+
touch /golangci-verify.done
3440

3541
FROM base AS yamllint
3642
RUN --mount=target=/go/src/github.com/moby/buildkit \
@@ -89,5 +95,6 @@ EOF
8995

9096
FROM scratch
9197
COPY --link --from=golangci-lint /golangci-lint.done /
98+
COPY --link --from=golangci-verify /golangci-verify.done /
9299
COPY --link --from=yamllint /yamllint.done /
93100
COPY --link --from=protolint /protolint.done /

0 commit comments

Comments
 (0)