Skip to content

Commit 06121d3

Browse files
now go is at 1.24 we don't need <1.20 warnings
1 parent 87e0ce8 commit 06121d3

File tree

2 files changed

+0
-17
lines changed

2 files changed

+0
-17
lines changed

docker/toolchain/bootstrap_pure.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ if [ "$GOROOT" == "" ]; then
2626
fi
2727
export GOROOT_BOOTSTRAP=$GOROOT
2828

29-
GO_VERSION_MAJOR=$(go version | sed -e 's/.*go\([0-9]\+\)\..*/\1/')
30-
GO_VERSION_MINOR=$(go version | sed -e 's/.*go[0-9]\+\.\([0-9]\+\)\..*/\1/')
31-
32-
echo "Bootstrapping is no longer needed for go 1.20+"
33-
3429
# Install garble (go1.20+) for obfuscated builds
3530
echo "Installing garble..."
3631
go install mvdan.cc/garble@latest

xgo.go

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@ func main() {
128128
if len(flag.Args()) != 1 {
129129
log.Fatalf("Usage: %s [options] <go import path>", os.Args[0])
130130
}
131-
if *obfuscate && *goVersion != "latest" {
132-
re := regexp.MustCompile(`^go-(\d+)\.(\d+)\..+$`)
133-
matches := re.FindStringSubmatch(*goVersion)
134-
if len(matches) < 3 {
135-
log.Fatalf("Invalid Go release: %s.", *goVersion)
136-
}
137-
versionMajor, _ := strconv.Atoi(matches[1])
138-
versionMinor, _ := strconv.Atoi(matches[2])
139-
if versionMajor < 1 || (versionMajor == 1 && versionMinor < 20) {
140-
log.Fatalln("Obfuscated builds are only available for go 1.20+")
141-
}
142-
}
143131
// Select the image to use, either official or custom
144132
image = dockerDist + *goVersion
145133
if *dockerImage != "" {

0 commit comments

Comments
 (0)