version: show tailscale/go toolchain git hash in version output
When built with the Tailscale Go toolchain, include the toolchain's git revision in the version output. The non-JSON output shows the first 10 hex digits: go version: go1.26.2 (tailscale/go dfe2a5fd8e) The JSON output includes the full hash as "tailscaleGoGitHash", or omits the field when not using tsgo. The toolchain rev is read via a separate sync.OnceValue rather than piggybacking on getEmbeddedInfo, because that function discards all data when VCS fields are absent (e.g. in test binaries), while the tailscale.toolchain.rev setting is still present. Also add a CI-only test verifying tailscaleToolchainRev is non-empty when built with the tailscale_go build tag. Fixes #19374 Change-Id: Ied0b16d7aead5471d8c614c30cba8b0dcf80c691 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
5a7ef4a533
commit
9dfe7875fd
@@ -3,7 +3,13 @@
|
||||
|
||||
package version
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"os/exec"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"tailscale.com/util/cibuild"
|
||||
)
|
||||
|
||||
func TestIsValidLongWithTwoRepos(t *testing.T) {
|
||||
tests := []struct {
|
||||
@@ -26,6 +32,26 @@ func TestIsValidLongWithTwoRepos(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestTailscaleToolchainRev(t *testing.T) {
|
||||
out, err := exec.Command("go", "env", "GOROOT").Output()
|
||||
if err != nil {
|
||||
t.Fatalf("go env GOROOT: %v", err)
|
||||
}
|
||||
goRoot := strings.TrimSpace(string(out))
|
||||
isTsgo := strings.Contains(goRoot, "/.cache/tsgo/")
|
||||
if !cibuild.On() && !isTsgo {
|
||||
t.Skip("skipping; not in CI and not using the Tailscale Go toolchain")
|
||||
}
|
||||
if !isTailscaleGo {
|
||||
t.Skip("skipping; not built with tailscale_go build tag")
|
||||
}
|
||||
rev := tailscaleToolchainRev()
|
||||
if rev == "" {
|
||||
t.Fatal("tailscale.toolchain.rev is empty in build info; expected non-empty when using tsgo")
|
||||
}
|
||||
t.Logf("tailscale.toolchain.rev = %s", rev)
|
||||
}
|
||||
|
||||
func TestPrepExeNameForCmp(t *testing.T) {
|
||||
cases := []struct {
|
||||
exe string
|
||||
|
||||
Reference in New Issue
Block a user