From 50501f00a66ce39c0f34506064f28dcce3f1479b Mon Sep 17 00:00:00 2001 From: James Tucker Date: Thu, 30 Jan 2025 14:47:40 -0800 Subject: [PATCH] version/mkversion: support tags ending in -pre Updates #TODO Signed-off-by: James Tucker --- version/mkversion/mkversion.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/version/mkversion/mkversion.go b/version/mkversion/mkversion.go index 2fa84480d..eb52a2c4f 100644 --- a/version/mkversion/mkversion.go +++ b/version/mkversion/mkversion.go @@ -190,7 +190,12 @@ func tailscaleModuleRef(modBs []byte) (string, error) { // Get the last - separated part of req.Mod.Version // (which is the git hash). if i := strings.LastIndexByte(req.Mod.Version, '-'); i != -1 { - return req.Mod.Version[i+1:], nil + // If the last part is "pre", the version is a pre-release. + hashOrPre := req.Mod.Version[i+1:] + if hashOrPre == "pre" { + return req.Mod.Version, nil + } + return hashOrPre, nil } // If there are no dashes, the version is a tag. return req.Mod.Version, nil