Install pinned goimports in script/bootstrap (closes #184)
Check / check (pull_request) Skipped
Check / check (pull_request) Skipped
script/fmt runs gofmt, goimports, and npx prettier, but bootstrap installed only git, make, go, and golangci-lint, so `make fmt` failed with `goimports: not found` on a fresh machine. bootstrap's contract is to install all dependencies idempotently. Add ensure_goimports: it skips when goimports is already on PATH, otherwise `go install`s golang.org/x/tools/cmd/goimports at a pinned exact version (v0.49.0; integrity via the Go module checksum database) and places the binary in /usr/local/bin so it is on PATH regardless of shell config, mirroring the golangci-lint release install. v0.49.0 requires Go 1.25, matching go.mod; v0.50.0 would force a Go 1.26 toolchain download. Model: opus-4-8
This commit is contained in:
@@ -20,6 +20,9 @@ main cannot regress.
|
|||||||
|
|
||||||
# Completed Steps
|
# Completed Steps
|
||||||
|
|
||||||
|
- 2026-09-22: `script/bootstrap` now installs a pinned `goimports`
|
||||||
|
(`golang.org/x/tools` v0.49.0) into `/usr/local/bin`, so `make fmt`
|
||||||
|
succeeds on a fresh machine after `make bootstrap` (#184).
|
||||||
- 2026-09-09: Fixed four deployability blockers found by QA: CSRF origin
|
- 2026-09-09: Fixed four deployability blockers found by QA: CSRF origin
|
||||||
check over plain HTTP (`UPAAS_PLAINTEXT_HTTP`, #189), pulling the git
|
check over plain HTTP (`UPAAS_PLAINTEXT_HTTP`, #189), pulling the git
|
||||||
image when absent (#190), the env-var editor CSRF token lookup (#191),
|
image when absent (#190), the env-var editor CSRF token lookup (#191),
|
||||||
|
|||||||
+20
-1
@@ -5,7 +5,9 @@
|
|||||||
# or apk (detected in that order); assumes NOTHING is present (not git,
|
# or apk (detected in that order); assumes NOTHING is present (not git,
|
||||||
# make, or go). golangci-lint is packaged in nix, brew, and apk; on apt
|
# make, or go). golangci-lint is packaged in nix, brew, and apk; on apt
|
||||||
# it is installed from a hash-verified GitHub release archive (never
|
# it is installed from a hash-verified GitHub release archive (never
|
||||||
# curl | sh).
|
# curl | sh). goimports is installed with `go install` at a pinned
|
||||||
|
# version (integrity via the Go module checksum database) into
|
||||||
|
# /usr/local/bin so it is on PATH.
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
|
||||||
@@ -15,6 +17,9 @@ GOLANGCI_LINT_VERSION="2.12.2"
|
|||||||
# sha256 of golangci-lint-2.12.2-linux-<arch>.tar.gz release archives
|
# sha256 of golangci-lint-2.12.2-linux-<arch>.tar.gz release archives
|
||||||
GOLANGCI_LINT_SHA256_AMD64="8df580d2670fed8fa984aac0507099af8df275e665215f5c7a2ae3943893a553"
|
GOLANGCI_LINT_SHA256_AMD64="8df580d2670fed8fa984aac0507099af8df275e665215f5c7a2ae3943893a553"
|
||||||
GOLANGCI_LINT_SHA256_ARM64="44cd40a8c76c86755375adfeea52cfd3533cb43d7bd647771e0ae065e166df3a"
|
GOLANGCI_LINT_SHA256_ARM64="44cd40a8c76c86755375adfeea52cfd3533cb43d7bd647771e0ae065e166df3a"
|
||||||
|
# golang.org/x/tools goimports, 2026-08-13. v0.49.0 requires Go 1.25 (matches
|
||||||
|
# go.mod); v0.50.0 needs Go 1.26. Integrity via the Go module checksum database.
|
||||||
|
GOIMPORTS_VERSION="v0.49.0"
|
||||||
|
|
||||||
PKGMGR=""
|
PKGMGR=""
|
||||||
SUDO=""
|
SUDO=""
|
||||||
@@ -102,6 +107,19 @@ ensure_golangci_lint() {
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# goimports is not packaged uniformly across nix/apt/brew/apk, so install it
|
||||||
|
# with `go install` at a pinned version and place the binary in /usr/local/bin
|
||||||
|
# so it is on PATH regardless of shell config, as the golangci-lint release
|
||||||
|
# install does. Requires go, which main installs first.
|
||||||
|
ensure_goimports() {
|
||||||
|
if ! missing goimports; then return 0; fi
|
||||||
|
detect_pkgmgr
|
||||||
|
tmp="$(mktemp -d)"
|
||||||
|
GOBIN="$tmp" go install "golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION}"
|
||||||
|
$SUDO install -m 0755 "$tmp/goimports" /usr/local/bin/goimports
|
||||||
|
rm -rf "$tmp"
|
||||||
|
}
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
cd "$ROOT"
|
cd "$ROOT"
|
||||||
|
|
||||||
@@ -112,6 +130,7 @@ main() {
|
|||||||
# Go toolchain and linter
|
# Go toolchain and linter
|
||||||
if missing go; then pkg_install go golang go go; fi
|
if missing go; then pkg_install go golang go go; fi
|
||||||
ensure_golangci_lint
|
ensure_golangci_lint
|
||||||
|
ensure_goimports
|
||||||
|
|
||||||
go mod download
|
go mod download
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user