From cb2ccc71898f04b81922b2ad84efa90bfbd94457 Mon Sep 17 00:00:00 2001 From: sivchari Date: Fri, 15 Nov 2024 16:17:57 +0900 Subject: [PATCH 1/2] support development Go version Signed-off-by: sivchari --- v2/skeleton/skeleton.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/v2/skeleton/skeleton.go b/v2/skeleton/skeleton.go index 4543789..718f843 100644 --- a/v2/skeleton/skeleton.go +++ b/v2/skeleton/skeleton.go @@ -45,6 +45,12 @@ func Main(version string, args []string) int { return ExitError } + if strings.HasPrefix(gover, "devel ") { + // The devel format is like following. + // devel go1.24-xxxxxxxxxx Day Date Mon Time Arch" + gover = strings.Split(strings.TrimPrefix(gover, "devel "), "-")[0] + } + s.GoVersion = gover return s.Run(version, args) From 2574a8b533db3155d17915f95396437d7d244f1d Mon Sep 17 00:00:00 2001 From: sivchari Date: Fri, 15 Nov 2024 21:35:12 +0900 Subject: [PATCH 2/2] use strings.Cut Signed-off-by: sivchari --- v2/skeleton/skeleton.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/v2/skeleton/skeleton.go b/v2/skeleton/skeleton.go index 718f843..aa513cb 100644 --- a/v2/skeleton/skeleton.go +++ b/v2/skeleton/skeleton.go @@ -48,7 +48,11 @@ func Main(version string, args []string) int { if strings.HasPrefix(gover, "devel ") { // The devel format is like following. // devel go1.24-xxxxxxxxxx Day Date Mon Time Arch" - gover = strings.Split(strings.TrimPrefix(gover, "devel "), "-")[0] + ver, _, ok := strings.Cut(strings.TrimPrefix(gover, "go"), "-") + if !ok { + return ExitError + } + gover = ver } s.GoVersion = gover