From 002e34c6eb7382f5121056cc14f7b7bde8cb18bf Mon Sep 17 00:00:00 2001
From: Dominic Evans <dominic.evans@uk.ibm.com>
Date: Thu, 16 Jan 2025 16:28:08 +0000
Subject: [PATCH 1/3] fix(ci): ensure 'auto' toolchain applies to generate

---
 script/generate.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/script/generate.sh b/script/generate.sh
index 8d5f240dfaa..c02271f6cdc 100755
--- a/script/generate.sh
+++ b/script/generate.sh
@@ -6,6 +6,11 @@ set -e
 
 CDPATH="" cd -- "$(dirname -- "$0")/.."
 
+# force 1.22.0 default and "auto" toolchain (i.e., use the toolchain directive)
+# when running generate and mod tidy
+GOTOOLCHAIN="go1.22.0+auto"
+export GOTOOLCHAIN
+
 if [ "$1" = "--check" ]; then
   GENTEMP="$(mktemp -d)"
   git worktree add -q --detach "$GENTEMP"
@@ -43,6 +48,6 @@ for dir in $MOD_DIRS; do
   (
     cd "$dir"
     go generate ./...
-    GOTOOLCHAIN="go1.22+auto" go mod tidy
+    go mod tidy
   )
 done

From a220924dbf07bd91a34dd4c4a30e112257fba57f Mon Sep 17 00:00:00 2001
From: Glenn Lewis <6598971+gmlewis@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:04:12 -0400
Subject: [PATCH 2/3] Update script/generate.sh

Applying suggestion
---
 script/generate.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/script/generate.sh b/script/generate.sh
index c02271f6cdc..221df2567a2 100755
--- a/script/generate.sh
+++ b/script/generate.sh
@@ -8,7 +8,7 @@ CDPATH="" cd -- "$(dirname -- "$0")/.."
 
 # force 1.22.0 default and "auto" toolchain (i.e., use the toolchain directive)
 # when running generate and mod tidy
-GOTOOLCHAIN="go1.22.0+auto"
+export GOTOOLCHAIN="go1.22.0+auto"
 export GOTOOLCHAIN
 
 if [ "$1" = "--check" ]; then

From 2b837505ee81ae71354a693cd1ada12bb95652dd Mon Sep 17 00:00:00 2001
From: Glenn Lewis <6598971+gmlewis@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:04:37 -0400
Subject: [PATCH 3/3] Update script/generate.sh

Applying suggestion
---
 script/generate.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/script/generate.sh b/script/generate.sh
index 221df2567a2..2418dcf2d1b 100755
--- a/script/generate.sh
+++ b/script/generate.sh
@@ -9,7 +9,6 @@ CDPATH="" cd -- "$(dirname -- "$0")/.."
 # force 1.22.0 default and "auto" toolchain (i.e., use the toolchain directive)
 # when running generate and mod tidy
 export GOTOOLCHAIN="go1.22.0+auto"
-export GOTOOLCHAIN
 
 if [ "$1" = "--check" ]; then
   GENTEMP="$(mktemp -d)"