From 31e4f60047f49d95cc66795180cc7cb6bf879008 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Fri, 22 Oct 2021 09:44:37 -0700 Subject: [PATCH] version: embed VERSION.txt in unstamped version Temporary measure until we switch to Go 1.18. $ go run ./cmd/tailscale version 1.17.0-date.20211022 go version: go1.17 Updates #81 Change-Id: Ic82ebffa5f46789089e5fb9810b3f29e36a47f1a Signed-off-by: Brad Fitzpatrick --- cmd/tailscale/depaware.txt | 3 ++- cmd/tailscaled/depaware.txt | 1 + version-embed.go | 11 +++++++++++ version/version.go | 12 +++++++++++- 4 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 version-embed.go diff --git a/cmd/tailscale/depaware.txt b/cmd/tailscale/depaware.txt index 8a242fa45..f7501ebbf 100644 --- a/cmd/tailscale/depaware.txt +++ b/cmd/tailscale/depaware.txt @@ -27,6 +27,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep L nhooyr.io/websocket from tailscale.com/derp/derphttp+ L nhooyr.io/websocket/internal/errd from nhooyr.io/websocket L nhooyr.io/websocket/internal/xsync from nhooyr.io/websocket + tailscale.com from tailscale.com/version tailscale.com/atomicfile from tailscale.com/ipn+ tailscale.com/client/tailscale from tailscale.com/cmd/tailscale/cli+ tailscale.com/client/tailscale/apitype from tailscale.com/client/tailscale+ @@ -135,7 +136,7 @@ tailscale.com/cmd/tailscale dependencies: (generated by github.com/tailscale/dep crypto/tls from github.com/tcnksm/go-httpstat+ crypto/x509 from crypto/tls+ crypto/x509/pkix from crypto/x509+ - embed from tailscale.com/cmd/tailscale/cli + embed from tailscale.com/cmd/tailscale/cli+ encoding from encoding/json+ encoding/asn1 from crypto/x509+ encoding/base64 from encoding/json+ diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index 6f97c948c..9c7607784 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -149,6 +149,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de L nhooyr.io/websocket from tailscale.com/derp/derphttp+ L nhooyr.io/websocket/internal/errd from nhooyr.io/websocket L nhooyr.io/websocket/internal/xsync from nhooyr.io/websocket + tailscale.com from tailscale.com/version tailscale.com/atomicfile from tailscale.com/ipn+ LD tailscale.com/chirp from tailscale.com/cmd/tailscaled tailscale.com/client/tailscale from tailscale.com/derp diff --git a/version-embed.go b/version-embed.go new file mode 100644 index 000000000..a4b12982c --- /dev/null +++ b/version-embed.go @@ -0,0 +1,11 @@ +// Copyright (c) 2021 Tailscale Inc & AUTHORS All rights reserved. +// Use of this source code is governed by a BSD-style +// license that can be found in the LICENSE file. + +// Package tailscaleroot embeds VERSION.txt into the binary. +package tailscaleroot + +import _ "embed" + +//go:embed VERSION.txt +var Version string diff --git a/version/version.go b/version/version.go index ab4cadb22..4866b64bd 100644 --- a/version/version.go +++ b/version/version.go @@ -5,10 +5,20 @@ // Package version provides the version that the binary was built at. package version +import ( + "strings" + + tailscaleroot "tailscale.com" +) + // Long is a full version number for this build, of the form // "x.y.z-commithash", or "date.yyyymmdd" if no actual version was // provided. -var Long = "date.20211004" +var Long = "date.20211022" + +func init() { + Long = strings.TrimSpace(tailscaleroot.Version) + "-" + Long +} // Short is a short version number for this build, of the form // "x.y.z", or "date.yyyymmdd" if no actual version was provided.