Reconcile script/* with golangci-lint v2.12.2 and gate docker build on make check (closes #27) #28

Closed
clawbot wants to merge 4 commits from merge/next-to-main-1.1.0 into main
2 changed files with 13 additions and 12 deletions
Showing only changes of commit e9f2a6baf9 - Show all commits
+10 -9
View File
@@ -1,20 +1,21 @@
# Lint stage: format check + golangci-lint # Check stage: the full verification suite (fmt-check + lint + test) via
# `make check`, so any check failure fails the image build.
# golangci/golangci-lint:v2.12.2 (Debian-based), 2026-08-07 # golangci/golangci-lint:v2.12.2 (Debian-based), 2026-08-07
FROM golangci/golangci-lint:v2.12.2@sha256:5cceeef04e53efe1470638d4b4b4f5ceefd574955ab3941b2d9a68a8c9ad5240 AS lint FROM golangci/golangci-lint:v2.12.2@sha256:5cceeef04e53efe1470638d4b4b4f5ceefd574955ab3941b2d9a68a8c9ad5240 AS check
WORKDIR /src WORKDIR /src
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download RUN go mod download
COPY . . COPY . .
RUN make fmt-check RUN make check
RUN make lint
# Test stage: run full test suite # Build stage: compile on the Go toolchain the module targets. Copying
# from the check stage makes the build depend on it, so `docker build .`
# runs the checks first and only then builds.
# golang 1.22.12 (2025-02-04) # golang 1.22.12 (2025-02-04)
FROM golang@sha256:1cf6c45ba39db9fd6db16922041d074a63c935556a05c5ccb62d181034df7f02 AS test FROM golang@sha256:1cf6c45ba39db9fd6db16922041d074a63c935556a05c5ccb62d181034df7f02 AS build
# Depend on lint stage so both stages always run COPY --from=check /src/go.sum /dev/null
COPY --from=lint /src/go.sum /dev/null
WORKDIR /src WORKDIR /src
COPY go.mod go.sum ./ COPY go.mod go.sum ./
RUN go mod download RUN go mod download
COPY . . COPY . .
RUN make test RUN go build ./... && go build -o /out/example ./cmd/example
+3 -3
View File
@@ -1,14 +1,14 @@
#!/bin/sh #!/bin/sh
# script/check: run all checks (test, lint, fmt-check). Our own # script/check: run all checks (fmt-check, lint, test). Our own
# extension to scripts-to-rule-them-all. Must not modify any files. # extension to scripts-to-rule-them-all. Must not modify any files.
set -eu set -eu
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)" SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
main() { main() {
"$SCRIPT_DIR/test"
"$SCRIPT_DIR/lint"
"$SCRIPT_DIR/fmt-check" "$SCRIPT_DIR/fmt-check"
"$SCRIPT_DIR/lint"
"$SCRIPT_DIR/test"
} }
main "$@" main "$@"