drop Go 1.21 and start using go/version

Needing to awkwardly treat Go versions as if they were semver is no longer necessary thanks to go/version being in Go 1.22.0 now.
2026-04-22 23:57:14 +08:00 · 2024-02-11 21:26:14 +00:00
parent d76bc2eb47
commit ad2ecc7f2f
42 changed files with 75 additions and 253 deletions
@@ -33,7 +33,7 @@ binsubstr main$exe 'addJmp' 'AddImpl'
 -- go.mod --
 module test/with.many.dots/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -18,7 +18,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -59,7 +59,7 @@ binsubstr main$exe 'garble_main.go' 'globalVar' 'globalFunc' $gofullversion
 -- go.mod --
 module test/mainfoo

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -28,7 +28,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -29,7 +29,7 @@ binsubstr main$exe 'privateAdd'
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -31,7 +31,7 @@ exec garble build
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -30,7 +30,7 @@ grep 'func\(int\) int' $WORK/debug/test/main/GARBLE_controlflow.go
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -18,7 +18,7 @@ stderr 'test/main' # we force rebuilds with -debugdir
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -11,7 +11,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -46,7 +46,7 @@ exec $NAME/garble$exe build
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -54,7 +54,7 @@ bincmp out_rebuild out
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- standalone/main.go --
 package main

@@ -7,30 +7,30 @@ env PATH=${WORK}/.bin${:}${PATH}
 # An empty go version.
 env TOOLCHAIN_GOVERSION=''
 ! exec garble build
-stderr 'Go version is too old; please upgrade to Go 1\.21 or newer'
+stderr 'Go version is too old; please upgrade to go1\.22 or newer'

 # We should error on a devel version that's too old.
 # Note that they lacked the "goN.M-" prefix.
 env TOOLCHAIN_GOVERSION='devel +afb5fca Sun Aug 07 00:00:00 2020 +0000'
 ! exec garble build
-stderr 'Go version is too old; please upgrade to Go 1\.21 or newer'
+stderr 'Go version is too old; please upgrade to go1\.22 or newer'

 # Another form of old version; with an old "goN.M-" prefix.
 env TOOLCHAIN_GOVERSION='devel go1.15-afb5fca Sun Aug 07 00:00:00 2020 +0000'
 ! exec garble build
-stderr 'Go version "devel go1\.15-.*2020.*" is too old; please upgrade to Go 1\.21'
+stderr 'Go version "devel go1\.15-.*2020.*" is too old; please upgrade to go1\.22'

 # A current devel version should be fine.
 # Note that we don't look at devel version timestamps.
-env GARBLE_TEST_GOVERSION='go1.21'
-env TOOLCHAIN_GOVERSION='devel go1.21-ad97d204f0 Sun Sep 12 16:46:58 2023 +0000'
+env GARBLE_TEST_GOVERSION='go1.22'
+env TOOLCHAIN_GOVERSION='devel go1.22-ad97d204f0 Sun Sep 12 16:46:58 2023 +0000'
 ! exec garble build
 stderr 'mocking the real build'

 # We should error on a stable version that's too old.
 env TOOLCHAIN_GOVERSION='go1.14'
 ! exec garble build
-stderr 'Go version "go1\.14" is too old; please upgrade to Go 1\.21 or newer'
+stderr 'Go version "go1\.14" is too old; please upgrade to go1\.22 or newer'

 # We should accept a future stable version.
 # Note that we need to bump the version of Go that supposedly built it, too.
@@ -40,45 +40,45 @@ env TOOLCHAIN_GOVERSION='go1.28.2'
 stderr 'mocking the real build'

 # We should accept custom devel strings.
-env TOOLCHAIN_GOVERSION='devel go1.22-somecustomversion'
+env TOOLCHAIN_GOVERSION='devel go1.23-somecustomversion'
 ! exec garble build
 stderr 'mocking the real build'

 # The current toolchain may be older than the one that built garble.
-env GARBLE_TEST_GOVERSION='go1.22'
-env TOOLCHAIN_GOVERSION='go1.21.3'
+env GARBLE_TEST_GOVERSION='go1.23'
+env TOOLCHAIN_GOVERSION='go1.22.3'
 ! exec garble build
 stderr 'mocking the real build'

 # The current toolchain may be equal to the one that built garble.
-env GARBLE_TEST_GOVERSION='devel go1.21-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
-env TOOLCHAIN_GOVERSION='devel go1.21-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
+env GARBLE_TEST_GOVERSION='devel go1.22-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
+env TOOLCHAIN_GOVERSION='devel go1.22-6673d5d701 Sun Mar 20 16:05:03 2023 +0000'
 ! exec garble build
 stderr 'mocking the real build'

 # The current toolchain must not be newer than the one that built garble.
 env GARBLE_TEST_GOVERSION='go1.18'
-env TOOLCHAIN_GOVERSION='go1.21.1'
+env TOOLCHAIN_GOVERSION='go1.22.1'
 ! exec garble build
-stderr 'garble was built with "go1\.18" and is being used with "go1\.21\.1"; rebuild '
+stderr 'garble was built with "go1\.18" and can''t be used with the newer "go1\.22\.1"; rebuild '

 # We'll error even if the difference is a minor (bugfix) level.
 # In practice it probably wouldn't matter, but in theory it could still lead to tricky bugs.
-env GARBLE_TEST_GOVERSION='go1.21.11'
-env TOOLCHAIN_GOVERSION='go1.21.14'
+env GARBLE_TEST_GOVERSION='go1.22.11'
+env TOOLCHAIN_GOVERSION='go1.22.14'
 ! exec garble build
-stderr 'garble was built with "go1\.21\.11" and is being used with "go1\.21\.14"; rebuild '
+stderr 'garble was built with "go1\.22\.11" and can''t be used with the newer "go1\.22\.14"; rebuild '

 # If garble builds itself and is then used, it won't know what version built it.
 # As a fallback, we drop the comparison against the toolchain's version.
 env GARBLE_TEST_GOVERSION='bogus version'
-env TOOLCHAIN_GOVERSION='go1.21.3'
+env TOOLCHAIN_GOVERSION='go1.22.3'
 ! exec garble build
 stderr 'mocking the real build'
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -117,6 +117,6 @@ stderr 'usage: garble version'
 -- go.mod --
 module dummy

-go 1.21
+go 1.22
 -- dummy.go --
 package dummy
@@ -13,7 +13,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -42,7 +42,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main

-go 1.21
+go 1.22

 require (
 	gopkg.in/garbletest.v2 v2.999.0
@@ -12,7 +12,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -28,7 +28,7 @@ binsubstr main$exe 'unexportedVersion' 'ExportedUnset' 'v1.22.33' 'garble_replac
 -- go.mod --
 module domain.test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -34,7 +34,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -14,7 +14,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22

 replace big.chungus/meme => ./big.chungus/meme

@@ -149,7 +149,7 @@ func ByteIndex(s string, c byte) int
 -- big.chungus/meme/go.mod --
 module test/main

-go 1.21
+go 1.22
 -- big.chungus/meme/dante.go --
 package meme

@@ -8,7 +8,7 @@ imports_missing${/}imports.go:5:8: package test/main/missing is not in std (${GO
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- broken/broken.go --
 package broken

@@ -59,7 +59,7 @@ exec garble -literals build std
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -26,7 +26,7 @@ stdout 'build\s*vcs.revision='${HEAD_COMMIT_SHA}
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -26,7 +26,7 @@ cmp stderr main.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- plugin/main.go --
 package main

@@ -16,7 +16,7 @@ stdout 'varPositions is sorted'
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -14,7 +14,7 @@ cmp stdout main.stdout
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -46,7 +46,7 @@ cmp stdout main-literals.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- long_main.go --
 package main

@@ -14,7 +14,7 @@ stdout 'garble_main\.go 9$'
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -32,7 +32,7 @@ cd ..
 -- mod1/go.mod --
 module test/main/mod1

-go 1.21
+go 1.22

 require gopkg.in/garbletest.v2 v2.999.0

@@ -52,7 +52,7 @@ func main() { garbletest.Test() }
 -- mod2/go.mod --
 module test/main/mod2

-go 1.21
+go 1.22

 require gopkg.in/garbletest.v2 v2.999.0

@@ -97,7 +97,7 @@ cmp stderr importedpkg.stderr
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- main.go --
 package main

@@ -16,7 +16,7 @@ binsubstr main$exe 'globalVar' # 'globalType' matches on some, but not all, plat
 -- extra/go.mod --
 module private.source/extra

-go 1.21
+go 1.22
 -- extra/extra.go --
 package extra

@@ -26,7 +26,7 @@ func Func() string {
 -- go.mod --
 module test/main

-go 1.21
+go 1.22

 // We include an extra module to obfuscate, included in the same original source
 // code via a replace directive.
@@ -52,7 +52,7 @@ stdout 'package bar_test, func name: test/bar\.OriginalFuncName'
 -- go.mod --
 module test/bar

-go 1.21
+go 1.22
 -- bar.go --
 package bar

@@ -27,7 +27,7 @@ stderr 'funcStructExported false funcStructUnexported false'
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main

@@ -3,7 +3,7 @@ exec garble build
 -- go.mod --
 module test/main

-go 1.21
+go 1.22
 -- garble_main.go --
 package main