From fce731da8d68f06fd22f3f339ea285a2872944f0 Mon Sep 17 00:00:00 2001
From: jingyuanliang <jingyuanliang@google.com>
Date: Wed, 12 Feb 2025 17:10:09 -0500
Subject: [PATCH] Bump toolchain to Go 1.23 and 1.24 (with 1.22 going EOL)
 (#130)

---
 .github/workflows/crossbuild.yaml | 2 +-
 .github/workflows/tests.yaml      | 2 +-
 .github/workflows/tools.yaml      | 2 +-
 Makefile                          | 2 +-
 go.mod                            | 2 +-
 tools/go.mod                      | 2 +-
 tools/go.sum                      | 3 +++
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/crossbuild.yaml b/.github/workflows/crossbuild.yaml
index 9f680c43..65f5d550 100644
--- a/.github/workflows/crossbuild.yaml
+++ b/.github/workflows/crossbuild.yaml
@@ -6,7 +6,7 @@ jobs:
   crossbuild:
     strategy:
       matrix:
-        go-version: [ "1.22", "1.23" ]
+        go-version: [ "1.23", "1.24" ]
         platform: [ "ubuntu-latest" ]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 9f3afde5..aa588651 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -6,7 +6,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [ "1.22", "1.23" ]
+        go-version: [ "1.23", "1.24" ]
         platform: [ "ubuntu-latest" ]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/.github/workflows/tools.yaml b/.github/workflows/tools.yaml
index be73648f..ee43d6ba 100644
--- a/.github/workflows/tools.yaml
+++ b/.github/workflows/tools.yaml
@@ -6,7 +6,7 @@ jobs:
   tools:
     strategy:
       matrix:
-        go-version: [ "1.22", "1.23" ]
+        go-version: [ "1.23", "1.24" ]
         platform: [ "ubuntu-latest" ]
     runs-on: ${{ matrix.platform }}
     steps:
diff --git a/Makefile b/Makefile
index 2f42a26b..7f8f17c6 100644
--- a/Makefile
+++ b/Makefile
@@ -64,7 +64,7 @@ ARCH := $(if $(GOARCH),$(GOARCH),$(shell GOTOOLCHAIN=local go env GOARCH))
 
 TAG := $(VERSION)__$(OS)_$(ARCH)
 
-GO_VERSION := 1.23
+GO_VERSION := 1.24
 BUILD_IMAGE := golang:$(GO_VERSION)-alpine
 
 BIN_EXTENSION :=
diff --git a/go.mod b/go.mod
index 2d578e7d..15935f00 100644
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,5 @@
 module github.com/thockin/go-build-template
 
-go 1.22
+go 1.23
 
 require github.com/spf13/pflag v1.0.5
diff --git a/tools/go.mod b/tools/go.mod
index 6912ce12..5685540d 100644
--- a/tools/go.mod
+++ b/tools/go.mod
@@ -1,6 +1,6 @@
 module github.com/thockin/go-build-template/tools
 
-go 1.22.1
+go 1.23
 
 require (
 	github.com/estesp/manifest-tool/v2 v2.1.6
diff --git a/tools/go.sum b/tools/go.sum
index fe8683ab..e617da67 100644
--- a/tools/go.sum
+++ b/tools/go.sum
@@ -337,6 +337,7 @@ github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3
 github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A=
 github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M=
 github.com/gostaticanalysis/testutil v0.5.0 h1:Dq4wT1DdTwTGCQQv3rl3IvD5Ld0E6HiY+3Zh0sUGqw8=
+github.com/gostaticanalysis/testutil v0.5.0/go.mod h1:OLQSbuM6zw2EvCcXTz1lVq5unyoNft372msDY0nY5Hs=
 github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo=
 github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
@@ -611,7 +612,9 @@ github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs
 github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
 github.com/tdakkota/asciicheck v0.3.0 h1:LqDGgZdholxZMaJgpM6b0U9CFIjDCbFdUF00bDnBKOQ=
 github.com/tdakkota/asciicheck v0.3.0/go.mod h1:KoJKXuX/Z/lt6XzLo8WMBfQGzak0SrAKZlvRr4tg8Ac=
+github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
 github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
+github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
 github.com/tetafro/godot v1.4.20 h1:z/p8Ek55UdNvzt4TFn2zx2KscpW4rWqcnUrdmvWJj7E=
 github.com/tetafro/godot v1.4.20/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio=