diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fe5850f3e07..836e584e2eb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: tags: [ v2.* ] env: - GO_VER: 1.18.9 + GO_VER: 1.18.10 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 64b69976429..43b72b31bb5 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.18.9 + GO_VER: 1.18.10 jobs: basic-checks: diff --git a/Makefile b/Makefile index a0051fdbe2a..6e782dbf37b 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.18.9 +GO_VER = 1.18.10 GO_TAGS ?= RELEASE_EXES = orderer $(TOOLS_EXES) diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md index 04f87639888..fe2b7deff5d 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.18.7 +$ brew install go@1.18.10 $ go version -go1.18.7 darwin/amd64 +go1.18.10 darwin/amd64 ``` ### JQ diff --git a/release_notes/v2.5.0-beta.md b/release_notes/v2.5.0-beta.md index 11f9567da36..80f436496b3 100644 --- a/release_notes/v2.5.0-beta.md +++ b/release_notes/v2.5.0-beta.md @@ -48,7 +48,7 @@ All fixes as of v2.4.7 are also included in v2.5.0. Dependencies ------------ Fabric v2.5.0 has been tested with the following dependencies: -* Go 1.18.9 +* Go 1.18.10 * CouchDB v3.2.2 Fabric docker images on dockerhub utilize Ubuntu 20.04. diff --git a/vagrant/golang.sh b/vagrant/golang.sh index 258e0d17b7d..30a41572b5a 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.18.7 +GO_VERSION=1.18.10 # ---------------------------------------------------------------- # Install Golang