Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a2cc08cae9 |
+1
-2
@@ -17,8 +17,7 @@ COPY . .
|
||||
RUN golangci-lint run --config .golangci.yml ./...
|
||||
|
||||
# Test phase
|
||||
# golang:1.26-alpine, 2026-09-07. It carries Go 1.26.8, the version
|
||||
# script/bootstrap installs on the host; change both together.
|
||||
# golang:1.26-alpine, 2026-09-07
|
||||
FROM golang@sha256:ce864e7223ac17b1775e6fd0b4c0db580c2eb50e7953a427916379e4b92a1628 AS test
|
||||
|
||||
# -race needs cgo, and cgo needs a C toolchain.
|
||||
|
||||
@@ -5,9 +5,6 @@
|
||||
VERSION := $(shell git describe --tags --always --dirty 2>/dev/null || echo dev)
|
||||
LDFLAGS := -s -w -X 'sneak.berlin/go/keyfunc/internal/cli.Version=$(VERSION)'
|
||||
|
||||
# Where script/bootstrap installs Go; it cannot put it on our PATH.
|
||||
export PATH := $(HOME)/.local/go/bin:$(PATH)
|
||||
|
||||
.PHONY: default bootstrap setup build test lint fmt fmt-check check \
|
||||
docker cibuild hooks clean
|
||||
|
||||
|
||||
@@ -281,23 +281,11 @@ The repo adheres to the
|
||||
standard: most Makefile targets are thin shims over an executable in `script/`
|
||||
(`build` and `clean` are the exceptions).
|
||||
|
||||
- `script/bootstrap` installs, idempotently, everything needed to build and
|
||||
develop apart from Docker, which it only warns about when it is missing, and
|
||||
the linter, which only runs inside Docker. In this order:
|
||||
- git and make from nix, apt, brew or apk, and from there too curl and bash
|
||||
when a later step needs them;
|
||||
- Go at the version the `Dockerfile`'s Go image carries, from the official
|
||||
release archive at go.dev (checked against a sha256 in the script) into
|
||||
`~/.local/go`, unless the `go` first on the `PATH` already is that
|
||||
version; then the Go modules. `script/bootstrap` itself, `script/fmt`,
|
||||
`script/fmt-check`, `script/precommit` and the `Makefile` put
|
||||
`~/.local/go/bin` first on their `PATH`, so they use that Go;
|
||||
- node: an installed one is used as it is, otherwise a pinned one is
|
||||
installed through nvm, which, when it is missing, comes from its release
|
||||
archive, checked against a sha256;
|
||||
- yarn: an installed one is used as it is, otherwise the pinned version
|
||||
through corepack, or through npm where there is no corepack;
|
||||
- the pinned prettier, through yarn.
|
||||
- `script/bootstrap` installs everything needed to build and develop (git, make,
|
||||
Go, node and yarn), idempotently, from nix, apt, brew or apk, with node at a
|
||||
pinned version through nvm when it is not already installed; it then installs
|
||||
the pinned prettier with yarn. It does not install the linter, which only runs
|
||||
inside Docker.
|
||||
- `script/setup` prepares a fresh clone: it runs `bootstrap`, then installs the
|
||||
git pre-commit hook.
|
||||
- `script/projectname` prints the project name; other scripts call it so they
|
||||
@@ -311,8 +299,8 @@ standard: most Makefile targets are thin shims over an executable in `script/`
|
||||
- `script/fmt` formats in place: the Go source with `go fmt`, then every
|
||||
Markdown file with prettier (four-space indents, prose wrapped at 80 columns).
|
||||
- `script/fmt-check` checks the same files the same way without writing, failing
|
||||
if anything is unformatted. Both need the node, yarn and prettier that
|
||||
`bootstrap` installs.
|
||||
if anything is unformatted. Both need the node and yarn that `bootstrap`
|
||||
installs.
|
||||
- `script/check` runs `test`, `lint` and `fmt-check` and changes no files.
|
||||
- `script/docker` builds the Docker image, uncached, tagged with the project
|
||||
name and stamped with the version `git describe` gives on the host. The image
|
||||
|
||||
+7
-77
@@ -3,28 +3,16 @@
|
||||
# repo. Idempotent: every install is guarded by a check, so tools that
|
||||
# are already there are left alone. Base tooling comes from nix, apt,
|
||||
# brew, or apk, detected in that order, and nothing is assumed to be
|
||||
# present. Go is installed at the version the Dockerfile's Go image
|
||||
# carries, from the official release archive, into ~/.local/go. Node is
|
||||
# used directly if installed; otherwise it is installed at a pinned
|
||||
# version via nvm (installing nvm itself first, from a hash-verified
|
||||
# release archive, never curl | sh). The linter is not installed here:
|
||||
# linting and testing run only as phases of the Dockerfile, so Docker is
|
||||
# what is needed for them, and that is checked for rather than
|
||||
# installed.
|
||||
# present. Node is used directly if installed; otherwise it is installed
|
||||
# at a pinned version via nvm (installing nvm itself first, from a
|
||||
# hash-verified release archive, never curl | sh). The linter is not
|
||||
# installed here: linting and testing run only as phases of the
|
||||
# Dockerfile, so Docker is what is needed for them, and that is checked
|
||||
# for rather than installed.
|
||||
set -eu
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
# Must match the Go in the Dockerfile's golang image; the sha256 of each
|
||||
# archive is in install_go.
|
||||
GO_VERSION="1.26.8"
|
||||
|
||||
# This script cannot change its caller's PATH, so script/fmt,
|
||||
# script/fmt-check, script/precommit and the Makefile put this directory
|
||||
# first on their own PATH, as is done here.
|
||||
GO_DIR="$HOME/.local/go"
|
||||
PATH="$GO_DIR/bin:$PATH"
|
||||
|
||||
# Pinned versions, 2026-07-06
|
||||
NODE_VERSION="22.17.0"
|
||||
NVM_VERSION="0.40.3"
|
||||
@@ -54,9 +42,6 @@ detect_pkgmgr() {
|
||||
if [ "$(id -u)" != "0" ]; then
|
||||
SUDO="sudo"
|
||||
fi
|
||||
# This runs once, before the first install: a fresh host or
|
||||
# runner image has no package lists yet.
|
||||
$SUDO apt-get update
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -90,52 +75,6 @@ verify_sha256() {
|
||||
fi
|
||||
}
|
||||
|
||||
# True when the go first on PATH reports exactly GO_VERSION. No go, a go
|
||||
# that fails, or any other output is a mismatch.
|
||||
go_version_matches() {
|
||||
out="$(go version 2>/dev/null)" || return 1
|
||||
case "$out" in
|
||||
"go version go$GO_VERSION "*) return 0 ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
}
|
||||
|
||||
install_go() {
|
||||
# sha256 of the go1.26.8 archives at https://go.dev/dl/, 2026-10-04
|
||||
case "$(uname -s)-$(uname -m)" in
|
||||
Linux-x86_64)
|
||||
platform="linux-amd64"
|
||||
sha256="d0f743b33e8d8945e6b1f432edd15785c70507121d6e2a723b21285eddf8b57b"
|
||||
;;
|
||||
Linux-aarch64)
|
||||
platform="linux-arm64"
|
||||
sha256="211ffced9dcb9633a55eac6364816ec0ddd951389a740e88fa8b3337971bdda0"
|
||||
;;
|
||||
Darwin-x86_64)
|
||||
platform="darwin-amd64"
|
||||
sha256="186be014105aa6542b767d2c6ed5cca10a0214bdff809ef1724022a8c7894150"
|
||||
;;
|
||||
Darwin-arm64)
|
||||
platform="darwin-arm64"
|
||||
sha256="a012b25b571bd0138a03dcd25375ceba866fe5ca822f426d2c66a4de56fd3f4b"
|
||||
;;
|
||||
*)
|
||||
echo "bootstrap: no Go archive pinned for $(uname -s) $(uname -m)" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
if missing curl; then pkg_install curl curl curl curl; fi
|
||||
tmp="$(mktemp -d)"
|
||||
curl -fsSL -o "$tmp/go.tar.gz" \
|
||||
"https://go.dev/dl/go${GO_VERSION}.${platform}.tar.gz"
|
||||
verify_sha256 "$tmp/go.tar.gz" "$sha256"
|
||||
# An archive unpacked over an older Go leaves a broken tree.
|
||||
rm -rf "$GO_DIR"
|
||||
mkdir -p "$GO_DIR"
|
||||
tar -xzf "$tmp/go.tar.gz" -C "$GO_DIR" --strip-components=1
|
||||
rm -rf "$tmp"
|
||||
}
|
||||
|
||||
# nvm is a bash script; run a command in a bash with nvm loaded
|
||||
nvm_sh() {
|
||||
bash -c ". \"\$HOME/.nvm/nvm.sh\" && $*"
|
||||
@@ -189,16 +128,7 @@ main() {
|
||||
|
||||
if missing git; then pkg_install git git git git; fi
|
||||
if missing make; then pkg_install gnumake make make make; fi
|
||||
|
||||
if ! go_version_matches; then
|
||||
install_go
|
||||
hash -r
|
||||
if ! go_version_matches; then
|
||||
echo "bootstrap: $(command -v go) is not go$GO_VERSION after installing it" >&2
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
go version
|
||||
if missing go; then pkg_install go golang go go; fi
|
||||
|
||||
go mod download
|
||||
|
||||
|
||||
@@ -5,9 +5,6 @@ set -eu
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
# Where script/bootstrap installs Go; it cannot put it on our PATH.
|
||||
PATH="$HOME/.local/go/bin:$PATH"
|
||||
|
||||
# Must match the pin in script/bootstrap.
|
||||
NODE_VERSION="22.17.0"
|
||||
|
||||
|
||||
@@ -5,9 +5,6 @@ set -eu
|
||||
|
||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||
|
||||
# Where script/bootstrap installs Go; it cannot put it on our PATH.
|
||||
PATH="$HOME/.local/go/bin:$PATH"
|
||||
|
||||
# Must match the pin in script/bootstrap.
|
||||
NODE_VERSION="22.17.0"
|
||||
|
||||
|
||||
@@ -7,9 +7,6 @@ set -eu
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd -P)"
|
||||
ROOT="$(cd "$SCRIPT_DIR/.." && pwd -P)"
|
||||
|
||||
# Where script/bootstrap installs Go; it cannot put it on our PATH.
|
||||
PATH="$HOME/.local/go/bin:$PATH"
|
||||
|
||||
main() {
|
||||
cd "$ROOT"
|
||||
go mod tidy
|
||||
|
||||
Reference in New Issue
Block a user