Compare commits
1 Commits
fix/115-ci
...
9054db8d86
| Author | SHA1 | Date | |
|---|---|---|---|
| 9054db8d86 |
21
Dockerfile
21
Dockerfile
@@ -15,25 +15,8 @@ RUN go mod download
|
|||||||
|
|
||||||
COPY . .
|
COPY . .
|
||||||
|
|
||||||
# Run all checks - build fails if any check fails.
|
# Run all checks - build fails if any check fails
|
||||||
#
|
RUN make check
|
||||||
# CHECK_EPOCH is a cache-busting build argument. Without it, an
|
|
||||||
# unchanged tree leaves this layer's cache key identical and Docker
|
|
||||||
# serves the previous verdict instead of re-running the suite, so the
|
|
||||||
# build reports a green it did not earn. A build argument's value
|
|
||||||
# participates in the cache key of later instructions in the stage even
|
|
||||||
# when they do not reference it, so a fresh value busts this layer
|
|
||||||
# either way. It is expanded into the command deliberately: that makes
|
|
||||||
# the invalidation a property of the command string itself rather than
|
|
||||||
# of how a given builder treats unreferenced args, and it surfaces the
|
|
||||||
# epoch in the build log as a diagnostic.
|
|
||||||
#
|
|
||||||
# Placing the ARG here and nowhere earlier keeps everything above it
|
|
||||||
# (toolchain install, go mod download) cached, so only the check and the
|
|
||||||
# steps after it re-run. script/cibuild passes a fresh value per run; a
|
|
||||||
# plain `docker build` without it caches as before.
|
|
||||||
ARG CHECK_EPOCH
|
|
||||||
RUN echo "check epoch: ${CHECK_EPOCH}" && make check
|
|
||||||
|
|
||||||
# Build the binary
|
# Build the binary
|
||||||
RUN make build
|
RUN make build
|
||||||
|
|||||||
@@ -393,10 +393,7 @@ them. We provide:
|
|||||||
- `script/check` — run test, lint, and fmt-check
|
- `script/check` — run test, lint, and fmt-check
|
||||||
- `script/docker` — build the Docker image tagged via
|
- `script/docker` — build the Docker image tagged via
|
||||||
`script/projectname`
|
`script/projectname`
|
||||||
- `script/cibuild` — CI entrypoint: `docker build .` with a fresh
|
- `script/cibuild` — CI entrypoint: plain `docker build .`
|
||||||
`CHECK_EPOCH` build argument, so the Dockerfile's `make check` layer
|
|
||||||
is never served from the cache and a green build always means the
|
|
||||||
checks ran on this invocation
|
|
||||||
- `script/precommit` — run by the git pre-commit hook; `go mod tidy`
|
- `script/precommit` — run by the git pre-commit hook; `go mod tidy`
|
||||||
guard, then `script/check`
|
guard, then `script/check`
|
||||||
- `script/install-precommit` — install the git pre-commit hook
|
- `script/install-precommit` — install the git pre-commit hook
|
||||||
|
|||||||
10
TODO.md
10
TODO.md
@@ -25,16 +25,6 @@ confirm make check still passes.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
- 2026-08-09: `script/cibuild` can no longer report a green it did not
|
|
||||||
earn. The Dockerfile declares `ARG CHECK_EPOCH` immediately above the
|
|
||||||
check step and expands it into the `RUN` command, and `script/cibuild`
|
|
||||||
passes a fresh `$(date +%s%N)` per invocation, so the `make check`
|
|
||||||
layer is always re-executed while the pinned toolchain install and
|
|
||||||
`go mod download` stay cached. Verified by experiment: before the fix
|
|
||||||
a second run on an unchanged tree returned in 283 ms with the check
|
|
||||||
layer `CACHED`; after it the check runs every time, and a deliberately
|
|
||||||
planted always-failing test made the build fail with exactly that
|
|
||||||
test's message
|
|
||||||
- 2026-08-07: golangci-lint bumped to v2.12.2 (commit-pinned installs
|
- 2026-08-07: golangci-lint bumped to v2.12.2 (commit-pinned installs
|
||||||
in `Dockerfile` and `script/bootstrap`); `.golangci.yml` set to the
|
in `Dockerfile` and `script/bootstrap`); `.golangci.yml` set to the
|
||||||
org-standard v2-schema config used across the org's repos
|
org-standard v2-schema config used across the org's repos
|
||||||
|
|||||||
@@ -1,18 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# script/cibuild: run the CI build. The Dockerfile runs make check, and
|
# script/cibuild: run the CI build. The Dockerfile runs make check, so
|
||||||
# the CHECK_EPOCH build argument below is fresh on every invocation, so
|
# a successful build implies all checks pass.
|
||||||
# the check layer is never served from the Docker layer cache: a
|
|
||||||
# successful build means the checks were executed and passed on this
|
|
||||||
# run, not on some earlier one. Only the check step and the steps after
|
|
||||||
# it are invalidated; the toolchain install and go mod download stay
|
|
||||||
# cached.
|
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
docker build --build-arg CHECK_EPOCH="$(date +%s%N)" .
|
docker build .
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
|||||||
Reference in New Issue
Block a user