fix(coordinator): report the shared build identity from --version

The nightly release roster added coordinator and coordinatorctl for 0.44.0,
and the additional-platform build checks every binary's --version against
the release identity. Both Coordinator CLIs used clap's bare crate version,
so under a nightly tag they printed `coordinator 0.44.0` where the check
expected the nightly identity, and the build step exited 1 without saying
which binary disagreed.

Both executables now report `registry_platform_buildinfo::DISPLAY_VERSION`
like the other products, and both build scripts name the binary, the
observed output, and the expected identity when the check fails.

Signed-off-by: Jeremi Joslin <jeremi@joslin.fr>

Author: jeremi

Cargo.lock

@@ -120,6 +120,7 @@ registry-platform-activation.workspace = true
 registry-platform-audit.workspace = true
 registry-platform-oidc.workspace = true
 registry-platform-authcommon.workspace = true
+registry-platform-buildinfo.workspace = true
 registry-platform-httpsec = { workspace = true, features = ["server"] }
 jsonwebtoken.workspace = true
 registry-platform-canonical-json.workspace = true

crates/registry-coordinator/Cargo.toml

@@ -22,7 +22,7 @@ pub const CTL_REPORT_KIND: &str = "CoordinatorCtlReport";
 #[command(
     name = "coordinatorctl",
     about = "Author, package, activate and operate Registry Coordinator",
-    version
+    version = registry_platform_buildinfo::DISPLAY_VERSION
 )]
 struct Cli {
     #[arg(long, global = true, value_enum, default_value_t = Format::Human)]

crates/registry-coordinator/src/cli.rs

@@ -26,7 +26,7 @@ const SHUTDOWN_GRACE: Duration = ATTEMPT_TIMEOUT.saturating_add(LEASE_FINALIZATI
 #[command(
     name = "coordinator",
     about = "Authenticated Registry Coordinator workflow service",
-    version
+    version = registry_platform_buildinfo::DISPLAY_VERSION
 )]
 struct Cli {
     /// Runtime configuration file.

crates/registry-coordinator/src/service.rs

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+use std::process::Command;
+
+fn version_output(executable: &str, flag: &str) -> String {
+    let output = Command::new(executable)
+        .arg(flag)
+        .output()
+        .unwrap_or_else(|err| panic!("{executable} {flag} runs: {err}"));
+    assert!(
+        output.status.success(),
+        "{executable} {flag} failed: {}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+    String::from_utf8_lossy(&output.stdout).into_owned()
+}
+
+/// Both Coordinator executables report the version text the shared build
+/// identity decides, so a nightly build names its dated source identity and
+/// an unmarked build names a development version. The release scripts compare
+/// `--version` against that text before they stage a binary.
+#[test]
+fn both_executables_report_the_shared_build_identity() {
+    for (name, executable) in [
+        ("coordinator", env!("CARGO_BIN_EXE_coordinator")),
+        ("coordinatorctl", env!("CARGO_BIN_EXE_coordinatorctl")),
+    ] {
+        for flag in ["--version", "-V"] {
+            assert_eq!(
+                version_output(executable, flag),
+                format!("{name} {}\n", registry_platform_buildinfo::DISPLAY_VERSION)
+            );
+        }
+    }
+}
+
+#[test]
+fn version_output_distinguishes_the_build_identity() {
+    let expected = if registry_platform_buildinfo::IS_RELEASE_BUILD {
+        env!("CARGO_PKG_VERSION").to_owned()
+    } else if registry_platform_buildinfo::IS_NIGHTLY_BUILD {
+        registry_platform_buildinfo::DISPLAY_VERSION.to_owned()
+    } else {
+        format!("{}-dev", env!("CARGO_PKG_VERSION"))
+    };
+    assert_eq!(
+        version_output(env!("CARGO_BIN_EXE_coordinator"), "--version"),
+        format!("coordinator {expected}\n")
+    );
+}

crates/registry-coordinator/tests/version_cli.rs

@@ -42,5 +42,9 @@ while read -r package binary; do
 		test -n "${typst_pin}"
 		expected+=" (typst ${typst_pin})"
 	fi
-	test "$("${destination}" --version)" = "${expected}"
+	observed="$("${destination}" --version)"
+	if [[ "${observed}" != "${expected}" ]]; then
+		printf '%s reports "%s"; the release identity expects "%s"\n' "${binary}" "${observed}" "${expected}" >&2
+		exit 1
+	fi
 done <<<"${builds}"

release/scripts/build-additional-platform-binaries.sh

@@ -326,7 +326,7 @@ if [[ "${exclude_discovery}" -eq 1 ]]; then
   additional_platform_builds="${filtered_platform_builds%$'\n'}"
 fi
 build_additional_platforms() {
-  local package binary expected typst_pin
+  local package binary expected observed typst_pin
   [[ -n "${additional_platform_builds}" ]] || return 0
   while read -r package binary; do
     [[ "${binary}" != scheduling ]] || continue
@@ -338,7 +338,11 @@ build_additional_platforms() {
       test -n "${typst_pin}"
       expected+=" (typst ${typst_pin})"
     fi
-    test "$("${staged_executable}" --version)" = "${expected}"
+    observed="$("${staged_executable}" --version)"
+    if [[ "${observed}" != "${expected}" ]]; then
+      printf '%s reports "%s"; the release identity expects "%s"\n' "${binary}" "${observed}" "${expected}" >&2
+      exit 1
+    fi
   done <<<"${additional_platform_builds}"
 }