Compare commits
1
Commits
next
..
8196ccfeb0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8196ccfeb0 |
@@ -13,6 +13,4 @@ jobs:
|
|||||||
# script/cibuild needs no token, so none is left in .git/config.
|
# script/cibuild needs no token, so none is left in .git/config.
|
||||||
with:
|
with:
|
||||||
persist-credentials: false
|
persist-credentials: false
|
||||||
# All history and tags, so git describe finds the version tag.
|
|
||||||
fetch-depth: 0
|
|
||||||
- run: script/cibuild
|
- run: script/cibuild
|
||||||
|
|||||||
@@ -25,8 +25,6 @@ linters:
|
|||||||
# silenced by disabling that name, not by enabling the successor.
|
# silenced by disabling that name, not by enabling the successor.
|
||||||
- wsl # Deprecated, replaced by wsl_v5
|
- wsl # Deprecated, replaced by wsl_v5
|
||||||
- gomodguard # Deprecated, replaced by gomodguard_v2
|
- gomodguard # Deprecated, replaced by gomodguard_v2
|
||||||
# Misses findings at random in v2.14.0; back once a pinned release fixes it
|
|
||||||
- canonicalheader
|
|
||||||
settings:
|
settings:
|
||||||
lll:
|
lll:
|
||||||
line-length: 88
|
line-length: 88
|
||||||
|
|||||||
@@ -21,39 +21,12 @@ fmt-check, and commit.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
- 2026-10-06: The canonical `.gitea/workflows/check.yml` now sets
|
|
||||||
`fetch-depth: 0` on its checkout step (issue 110), so CI fetches the history
|
|
||||||
and tags that `git describe --tags --always` needs, and a tagged repository
|
|
||||||
stamps the same version in CI as in a local build. `REPO_POLICIES.md` and both
|
|
||||||
checklists name `fetch-depth: 0` among what the workflow does, next to
|
|
||||||
`persist-credentials: false` and the `concurrency` block, instead of asking
|
|
||||||
each tagged repository to add it. Not yet tried on the shared runner, which is
|
|
||||||
out of disk space. Repositories pick this up on their next re-vendor.
|
|
||||||
- 2026-10-06: The canonical `script/bootstrap` now runs `apt-get update` once,
|
|
||||||
before the first `apt-get install` of a run (issue 115). The Gitea runner
|
|
||||||
image starts with empty package lists, so installing anything it lacks, such
|
|
||||||
as Go, failed with `Unable to locate package`. A repository's own section no
|
|
||||||
longer needs a refresh of its own; `sneak/bsfirehose` and `sneak/dnswatcher`
|
|
||||||
drop theirs at their next re-vendor.
|
|
||||||
- 2026-10-06: `REPO_POLICIES.md` and both checklists now say that a checkout
|
|
||||||
whose `.git` is a file, a linked worktree or a repository checked out as a
|
|
||||||
submodule, is the exception to a plain `docker build .` succeeding (issue
|
|
||||||
111): that file points to a git directory outside the build context, so the
|
|
||||||
build cannot read the version and the version check in the canonical
|
|
||||||
`Dockerfile` stops it. Such a build is given its version with
|
|
||||||
`--build-arg VERSION=...`, as `script/docker` and `script/cibuild` already do.
|
|
||||||
The check itself is unchanged.
|
|
||||||
- 2026-10-06: The canonical `.gitea/workflows/check.yml` now has a `concurrency`
|
- 2026-10-06: The canonical `.gitea/workflows/check.yml` now has a `concurrency`
|
||||||
block, so a new push cancels the older run on the same branch and no other,
|
block, so a new push cancels the older run on the same branch and no other,
|
||||||
and its checkout step sets `persist-credentials: false`, so the job's token is
|
and its checkout step sets `persist-credentials: false`, so the job's token is
|
||||||
not left in `.git/config` (issue 107). `REPO_POLICIES.md` and both checklists
|
not left in `.git/config` (issue 107). `REPO_POLICIES.md` and both checklists
|
||||||
describe the workflow as it now is. Not yet tried on the shared runner, which
|
describe the workflow as it now is. Not yet tried on the shared runner, which
|
||||||
is out of disk space. Repositories pick this up on their next re-vendor.
|
is out of disk space. Repositories pick this up on their next re-vendor.
|
||||||
- 2026-10-06: The canonical `.golangci.yml` now disables `canonicalheader`
|
|
||||||
(issue 105). In golangci-lint v2.14.0 it misses findings at random in a
|
|
||||||
package that also calls `ResponseWriter.Header()`, so the same tree can fail
|
|
||||||
lint on one run and pass on the next. It comes back once a pinned
|
|
||||||
golangci-lint release fixes it.
|
|
||||||
- 2026-10-06: The canonical `.gitignore` and `.editorconfig` now each end with a
|
- 2026-10-06: The canonical `.gitignore` and `.editorconfig` now each end with a
|
||||||
comment saying the repository's own entries go below it and a re-vendor keeps
|
comment saying the repository's own entries go below it and a re-vendor keeps
|
||||||
them (issue 103, which took in issue 104), as `.dockerignore`'s header already
|
them (issue 103, which took in issue 104), as `.dockerignore`'s header already
|
||||||
|
|||||||
@@ -91,20 +91,14 @@ with your task.
|
|||||||
version still comes out empty, `dev` or `unknown`. A plain
|
version still comes out empty, `dev` or `unknown`. A plain
|
||||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
`docker build .` with no build arguments must succeed; a Dockerfile that
|
||||||
refuses an empty build argument drops that refusal and keeps the argument.
|
refuses an empty build argument drops that refusal and keeps the argument.
|
||||||
A checkout whose `.git` is a file (a linked worktree, or a repository
|
`script/docker` and `script/cibuild` pass the version they compute on the
|
||||||
checked out as a submodule) is the exception: that file points to a git
|
host; it takes precedence. A tag-derived version additionally needs
|
||||||
directory outside the build context, so the build cannot read the version
|
`fetch-depth: 0` on the CI checkout step, which clones shallow and fetches
|
||||||
and a plain `docker build .` fails; pass the version with
|
no tags by default.
|
||||||
`--build-arg VERSION=...`. `script/docker` and `script/cibuild` already
|
|
||||||
pass the version they compute on the host; it takes precedence. The
|
|
||||||
canonical `.gitea/workflows/check.yml` sets `fetch-depth: 0` on its
|
|
||||||
checkout step, which otherwise clones shallow and fetches no tags, so a CI
|
|
||||||
build finds the tag too.
|
|
||||||
- [ ] Gitea Actions workflow in `.gitea/workflows/` runs `script/cibuild` on
|
- [ ] Gitea Actions workflow in `.gitea/workflows/` runs `script/cibuild` on
|
||||||
push, checks out with `persist-credentials: false` and with
|
push, checks out with `persist-credentials: false`, and carries the
|
||||||
`fetch-depth: 0` (which fetches the tags `git describe` needs), and
|
`concurrency` block that lets a new push cancel only the same branch's
|
||||||
carries the `concurrency` block that lets a new push cancel only the same
|
older run — reference
|
||||||
branch's older run — reference
|
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||||
- [ ] Language-specific config:
|
- [ ] Language-specific config:
|
||||||
- [ ] Go: `go.mod`, `go.sum`, `.golangci.yml` (fetch from
|
- [ ] Go: `go.mod`, `go.sum`, `.golangci.yml` (fetch from
|
||||||
|
|||||||
@@ -97,12 +97,6 @@ Template files can be fetched from:
|
|||||||
version still comes out empty, `dev` or `unknown`. A plain
|
version still comes out empty, `dev` or `unknown`. A plain
|
||||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
`docker build .` with no build arguments must succeed; a Dockerfile that
|
||||||
refuses an empty build argument drops that refusal and keeps the argument.
|
refuses an empty build argument drops that refusal and keeps the argument.
|
||||||
A checkout whose `.git` is a file (a linked worktree, or a repository
|
|
||||||
checked out as a submodule) is the exception: that file points to a git
|
|
||||||
directory outside the build context, so the build cannot read the version
|
|
||||||
and a plain `docker build .` fails; pass the version with
|
|
||||||
`--build-arg VERSION=...`, as `script/docker` and `script/cibuild` already
|
|
||||||
do.
|
|
||||||
- The Dockerfile carries a `lint` phase and a `test` phase, each invoking
|
- The Dockerfile carries a `lint` phase and a `test` phase, each invoking
|
||||||
its tool directly rather than through `make` or `script/`, and the final
|
its tool directly rather than through `make` or `script/`, and the final
|
||||||
stage carries a `COPY --from=` of a harmless file from each so the image
|
stage carries a `COPY --from=` of a harmless file from each so the image
|
||||||
@@ -112,10 +106,9 @@ Template files can be fetched from:
|
|||||||
- Non-server: the final stage brings up the dev environment
|
- Non-server: the final stage brings up the dev environment
|
||||||
- Image pinned by sha256 hash with version/date comment
|
- Image pinned by sha256 hash with version/date comment
|
||||||
- [ ] Gitea Actions workflow at `.gitea/workflows/check.yml` that runs
|
- [ ] Gitea Actions workflow at `.gitea/workflows/check.yml` that runs
|
||||||
`script/cibuild` on push, checks out with `persist-credentials: false` and
|
`script/cibuild` on push, checks out with `persist-credentials: false`,
|
||||||
with `fetch-depth: 0` (which fetches the tags `git describe` needs), and
|
and carries the `concurrency` block that lets a new push cancel only the
|
||||||
carries the `concurrency` block that lets a new push cancel only the same
|
same branch's older run — reference
|
||||||
branch's older run — reference
|
|
||||||
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
`https://git.eeqj.de/sneak/prompts/raw/branch/main/.gitea/workflows/check.yml`
|
||||||
- [ ] Language-specific:
|
- [ ] Language-specific:
|
||||||
- [ ] Go: `go mod init sneak.berlin/go/<name>`, `.golangci.yml` (fetch from
|
- [ ] Go: `go mod init sneak.berlin/go/<name>`, `.golangci.yml` (fetch from
|
||||||
|
|||||||
@@ -281,21 +281,12 @@ style conventions are in separate documents:
|
|||||||
`.git` and the version still comes out empty, `dev` or `unknown`. A plain
|
`.git` and the version still comes out empty, `dev` or `unknown`. A plain
|
||||||
`docker build .` with no build arguments must succeed; a Dockerfile that
|
`docker build .` with no build arguments must succeed; a Dockerfile that
|
||||||
refuses an empty build argument drops that refusal and keeps the argument.
|
refuses an empty build argument drops that refusal and keeps the argument.
|
||||||
A checkout whose `.git` is a file (a linked worktree, or a repository
|
|
||||||
checked out as a submodule) is the exception: that file points to a git
|
|
||||||
directory outside the build context, so the build cannot read the version
|
|
||||||
and a plain `docker build .` fails; pass the version with
|
|
||||||
`--build-arg VERSION=...`, as `script/docker` and `script/cibuild` already
|
|
||||||
do.
|
|
||||||
|
|
||||||
- Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
|
- Every repo should have a Gitea Actions workflow (`.gitea/workflows/`) that
|
||||||
runs `script/cibuild` on push, and checks out the repo as its only other step,
|
runs `script/cibuild` on push, and checks out the repo as its only other step,
|
||||||
with `persist-credentials: false`: `script/cibuild` needs no token, and
|
with `persist-credentials: false`: `script/cibuild` needs no token, and
|
||||||
without it the checkout leaves the job's token in `.git/config` for every
|
without it the checkout leaves the job's token in `.git/config` for every
|
||||||
later step. The checkout step also sets `fetch-depth: 0`, which fetches the
|
later step. Its `concurrency` block groups runs by workflow and branch
|
||||||
tags `git describe` needs: by default it clones shallow with no tags, and a
|
|
||||||
tagged repository's CI build would stamp a bare short commit id. The
|
|
||||||
workflow's `concurrency` block groups runs by workflow and branch
|
|
||||||
(`${{ github.workflow }}-${{ github.ref }}`) with `cancel-in-progress: true`,
|
(`${{ github.workflow }}-${{ github.ref }}`) with `cancel-in-progress: true`,
|
||||||
so a new push cancels the older run on the same branch, queued or running, and
|
so a new push cancels the older run on the same branch, queued or running, and
|
||||||
no other: runs for replaced commits do not hold up the shared runner.
|
no other: runs for replaced commits do not hold up the shared runner.
|
||||||
@@ -475,8 +466,8 @@ style conventions are in separate documents:
|
|||||||
there because `ARG` is stage-scoped; passing `VERSION` to a repo whose
|
there because `ARG` is stage-scoped; passing `VERSION` to a repo whose
|
||||||
Dockerfile declares no such `ARG` is ignored and costs nothing, which is why
|
Dockerfile declares no such `ARG` is ignored and costs nothing, which is why
|
||||||
the scripts stay byte-identical. One consequence for CI: the standard
|
the scripts stay byte-identical. One consequence for CI: the standard
|
||||||
checkout action clones shallow and fetches no tags, so the canonical
|
checkout action clones shallow and fetches no tags, so a repo that embeds a
|
||||||
`.gitea/workflows/check.yml` sets `fetch-depth: 0` on its checkout step.
|
tag-derived version must set `fetch-depth: 0` on its checkout step.
|
||||||
|
|
||||||
- **Verify `.dockerignore` by enumerating the image, not by reading the
|
- **Verify `.dockerignore` by enumerating the image, not by reading the
|
||||||
patterns.** Plant files at the root _and_ at least two directories deep, build
|
patterns.** Plant files at the root _and_ at least two directories deep, build
|
||||||
|
|||||||
+1
-9
@@ -19,7 +19,6 @@ YARN_VERSION="1.22.22"
|
|||||||
|
|
||||||
PKGMGR=""
|
PKGMGR=""
|
||||||
SUDO=""
|
SUDO=""
|
||||||
APT_UPDATED=""
|
|
||||||
|
|
||||||
detect_pkgmgr() {
|
detect_pkgmgr() {
|
||||||
[ -n "$PKGMGR" ] && return 0
|
[ -n "$PKGMGR" ] && return 0
|
||||||
@@ -48,14 +47,7 @@ pkg_install() {
|
|||||||
detect_pkgmgr
|
detect_pkgmgr
|
||||||
case "$PKGMGR" in
|
case "$PKGMGR" in
|
||||||
nix) nix-env -iA "nixpkgs.$1" ;;
|
nix) nix-env -iA "nixpkgs.$1" ;;
|
||||||
apt)
|
apt) $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y "$2" ;;
|
||||||
# Package lists may be empty (fresh images); refresh once per run.
|
|
||||||
if [ -z "$APT_UPDATED" ]; then
|
|
||||||
$SUDO env DEBIAN_FRONTEND=noninteractive apt-get update
|
|
||||||
APT_UPDATED=1
|
|
||||||
fi
|
|
||||||
$SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y "$2"
|
|
||||||
;;
|
|
||||||
brew) brew install "$3" ;;
|
brew) brew install "$3" ;;
|
||||||
apk) apk add --no-cache "$4" ;;
|
apk) apk add --no-cache "$4" ;;
|
||||||
esac
|
esac
|
||||||
|
|||||||
Reference in New Issue
Block a user