TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-29 04:55:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

version: only prefix VERSION.txt to version if not link-stamped

Browse Source 
(Fix to 31e4f60047)

The 31e4f60047 change accidentally
made it always prepend the VERSION.txt, even when it was already
link-stamped properly.

Updates #81

Change-Id: I6cdcff096c25d92d566ad3ac1de5771c7384daea
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2021-10-29 14:03:21 -07:00
parent 06dccea416
commit cb87b7aa5b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
version/version.go
View File

@ -16,17 +16,16 @@
// provided. // provided.
var Long = "date.20211022" var Long = "date.20211022"
func init() {
Long = strings.TrimSpace(tailscaleroot.Version) + "-" + Long
}
// Short is a short version number for this build, of the form // Short is a short version number for this build, of the form
// "x.y.z", or "date.yyyymmdd" if no actual version was provided. // "x.y.z", or "date.yyyymmdd" if no actual version was provided.
var Short = "" var Short = ""
func init() { func init() {
// If it hasn't been link-stamped with -X (via build_dist.sh or similar),
// then use the VERSION.txt file in the root and the date in the Long
// variable above which we occasionally bump by hand.
if Short == "" { if Short == "" {
// If it hasn't been link-stamped with -X: Long = strings.TrimSpace(tailscaleroot.Version) + "-" + Long
Short = Long Short = Long
} }
} }