From 0287c6e719dc7f815b6d1ee3f44a6ef0fdfcb48b Mon Sep 17 00:00:00 2001
From: Dave Enyeart <enyeart@us.ibm.com>
Date: Thu, 20 Jul 2023 04:30:46 -0400
Subject: [PATCH] Bump Go to 1.20.6 (release-2.5) (#4322)

Bump Go to 1.20.6.

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 ++--
 vagrant/golang.sh                  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f9ae9a947b6..32e53b91bc9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,7 +9,7 @@ on:
     tags: [ v2.* ]
 
 env:
-  GO_VER: 1.20.5
+  GO_VER: 1.20.6
   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 3f1ebd6e1b8..12db4675c05 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.20.5
+  GO_VER: 1.20.6
 
 jobs:
   basic-checks:
diff --git a/Makefile b/Makefile
index 7f54b0de4dd..7c61b2975b9 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.20.5
+GO_VER = 1.20.6
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
index 03f290fccb7..099063dc98a 100644
--- a/docs/source/prereqs.md
+++ b/docs/source/prereqs.md
@@ -82,9 +82,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.20.5
+$ brew install go@1.20.6
 $ go version
-go1.20.5 darwin/amd64
+go1.20.6 darwin/amd64
 ```
 
 ### JQ
diff --git a/vagrant/golang.sh b/vagrant/golang.sh
index 80bf08a3dd8..c19cddb3d86 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.20.5
+GO_VERSION=1.20.6
 
 # ----------------------------------------------------------------
 # Install Golang