From 3e5ab9ee196a4e88ff462fac9b174d7774aa0ea3 Mon Sep 17 00:00:00 2001
From: David Enyeart <enyeart@us.ibm.com>
Date: Tue, 10 Sep 2024 09:31:05 -0400
Subject: [PATCH] Bump Go to 1.23.1.

Also update go.mod to use three digit version to indicate toolchain version (most Go projects have switched to this approach at this point).

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
---
 .github/workflows/release.yml      | 2 +-
 .github/workflows/verify-build.yml | 2 +-
 Makefile                           | 2 +-
 docs/source/prereqs.md             | 4 ++--
 go.mod                             | 2 +-
 vagrant/golang.sh                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f919c934a25..ed4f18e572f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
     tags: [ v2.* ]
 
 env:
-  GO_VER: 1.22.5
+  GO_VER: 1.23.1
   UBUNTU_VER: 20.04
   FABRIC_VER: ${{ github.ref_name }}
   DOCKER_REGISTRY: ${{ github.repository_owner == 'hyperledger' && 'docker.io' || 'ghcr.io' }}
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
index 67ec12be9a3..9662fa95ce9 100644
--- a/.github/workflows/verify-build.yml
+++ b/.github/workflows/verify-build.yml
@@ -13,7 +13,7 @@ on:
 env:
   GOPATH: /opt/go
   PATH: /opt/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.22.5
+  GO_VER: 1.23.1
 
 jobs:
   basic-checks:
diff --git a/Makefile b/Makefile
index 5ef324d827f..a862ee5a2be 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 
-GO_VER = 1.22.5
+GO_VER = 1.23.1
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
index 9cc221a5d43..7521a220725 100644
--- a/docs/source/prereqs.md
+++ b/docs/source/prereqs.md
@@ -79,9 +79,9 @@ Optional: Install the latest Fabric supported version of [Go](https://golang.org
 installed (only required if you will be writing Go chaincode or SDK applications).
 
 ```shell
-$ brew install go@1.22.5
+$ brew install go@1.23.1
 $ go version
-go1.22.5 darwin/amd64
+go1.23.1 darwin/amd64
 ```
 
 ### JQ
diff --git a/go.mod b/go.mod
index b5d4a542596..67606c7d52a 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/hyperledger/fabric
 
-go 1.22
+go 1.23.1
 
 require (
 	code.cloudfoundry.org/clock v1.0.0
diff --git a/vagrant/golang.sh b/vagrant/golang.sh
index 4c80da08495..cc232257c1c 100644
--- a/vagrant/golang.sh
+++ b/vagrant/golang.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 GOROOT='/opt/go'
-GO_VERSION=1.22.5
+GO_VERSION=1.23.1
 
 # ----------------------------------------------------------------
 # Install Golang