Deploy main eacf1e7 to prod

Replaces #559, which conflicted.

Model: opus-5-5

internal/versionscript/version_script_test.go

@@ -115,8 +115,8 @@ func TestVersion_EnclosingRepositoryIsNotUsed(t *testing.T) {
 	require.Equal(t, unknown, runScript(t, inner, nil))
 }
 
-// The Docker build has no git metadata, so the version arrives as an
-// environment override. It wins over anything derivable.
+// An explicit VERSION, such as the Dockerfile's build arg, wins over
+// anything derivable.
 func TestVersion_EnvironmentOverrideWins(t *testing.T) {
 	t.Parallel()
 
@@ -128,8 +128,8 @@ func TestVersion_EnvironmentOverrideWins(t *testing.T) {
 }
 
 // An empty VERSION is treated as unset rather than stamping an empty
-// string: the Dockerfile's build arg has a non-empty default, but a
-// caller exporting VERSION= must not produce a binary reporting "".
+// string: a caller exporting VERSION= must not produce a binary
+// reporting "".
 func TestVersion_EmptyOverrideFallsBackToGit(t *testing.T) {
 	t.Parallel()
 
@@ -153,23 +153,21 @@ func TestVersion_IsStableAcrossInvocations(t *testing.T) {
 	require.Equal(t, first, second)
 }
 
-// The build target is the only place composing linker flags. If a
-// future edit drops either half, the binary silently reports "dev"
-// again (the defect this package exists for) or fails to link on
-// Alpine.
-func TestMakefile_BuildComposesVersionAndExtraFlags(t *testing.T) {
+// The build target is the only place that stamps the version. If a
+// future edit drops the -X flag, the binary silently reports "dev"
+// again, the defect this package exists for.
+func TestMakefile_BuildStampsTheVersion(t *testing.T) {
 	t.Parallel()
 
 	makefile := read(t, makefilePath)
 
 	require.Contains(t, makefile, "-X main.version=$(VERSION)")
-	require.Contains(t, makefile, "$(GO_LDFLAGS)")
 	require.Contains(t, makefile, "VERSION ?= $(shell script/version)")
 }
 
 // A caller can define VERSION as the empty string -- `make build
-// VERSION=`, or a `--build-arg VERSION=` reaching the Dockerfile's `make
-// build VERSION="$VERSION"`. script/version's own guard does not cover
+// VERSION=`, or the Dockerfile's `make build VERSION="$VERSION"` when no
+// VERSION build arg was given. script/version's own guard does not cover
 // that: the value never passes through the script. Stamping "" would
 // leave the binary reporting no version and the footer on "dev", which
 // is the defect this package exists for.
@@ -222,8 +220,8 @@ func requireMake(t *testing.T) {
 	}
 }
 
-// Every compile in the image goes through the build target, so the
-// static relink cannot replace the flags that carry the stamp.
+// The image compiles through the build target, so it carries the
+// target's version stamp.
 func TestDockerfile_BuildsThroughTheMakeTarget(t *testing.T) {
 	t.Parallel()
 
@@ -231,9 +229,8 @@ func TestDockerfile_BuildsThroughTheMakeTarget(t *testing.T) {
 
 	require.NotContains(t, dockerfile, "go build",
 		"a raw go build bypasses the Makefile's -X flag")
-	require.Contains(t, dockerfile, "ARG VERSION=")
-	require.Contains(t, dockerfile,
-		`make build VERSION="$VERSION" GO_LDFLAGS='-extldflags "-static"'`)
+	require.Contains(t, dockerfile, "ARG VERSION")
+	require.Contains(t, dockerfile, `RUN make build VERSION="$VERSION"`)
 }
 
 func read(t *testing.T, path string) string {