From b156d91f0d6693bfa3e581f9c69e43e6ba67548a Mon Sep 17 00:00:00 2001
From: Matthew Sykes <sykesmat@us.ibm.com>
Date: Wed, 10 Feb 2021 12:16:14 -0500
Subject: [PATCH] Update build to use Go 1.15

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
---
 Makefile                         | 2 +-
 ci/azure-pipelines-merge.yml     | 2 +-
 ci/azure-pipelines-release.yml   | 2 +-
 ci/azure-pipelines.yml           | 2 +-
 ci/install_deps.yml              | 2 +-
 docs/source/dev-setup/devenv.rst | 2 +-
 vagrant/golang.sh                | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 7c1e0357e38..99643626ab8 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ METADATA_VAR += CommitSHA=$(EXTRA_VERSION)
 METADATA_VAR += BaseDockerLabel=$(BASE_DOCKER_LABEL)
 METADATA_VAR += DockerNamespace=$(DOCKER_NS)
 
-GO_VER = 1.14.12
+GO_VER = 1.15.7
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
diff --git a/ci/azure-pipelines-merge.yml b/ci/azure-pipelines-merge.yml
index ab932c65226..7c38a3d9e79 100644
--- a/ci/azure-pipelines-merge.yml
+++ b/ci/azure-pipelines-merge.yml
@@ -11,7 +11,7 @@ pr: none
 variables:
   GOPATH: $(Agent.BuildDirectory)/go
   PATH: $(Agent.BuildDirectory)/go/bin:/usr/local/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GOVER: 1.14.12
+  GOVER: 1.15.7
 
 jobs:
   - job: UnitTests
diff --git a/ci/azure-pipelines-release.yml b/ci/azure-pipelines-release.yml
index c05441d077e..dcfe60c1f84 100644
--- a/ci/azure-pipelines-release.yml
+++ b/ci/azure-pipelines-release.yml
@@ -11,7 +11,7 @@ variables:
   - name: GOPATH
     value: $(Agent.BuildDirectory)/go
   - name: GOVER
-    value: 1.14.12
+    value: 1.15.7
 
 stages:
   - stage: BuildBinaries
diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
index cef05ca2026..9d9dcd0dfb0 100644
--- a/ci/azure-pipelines.yml
+++ b/ci/azure-pipelines.yml
@@ -11,7 +11,7 @@ pr:
 variables:
   GOPATH: $(Agent.BuildDirectory)/go
   PATH: $(Agent.BuildDirectory)/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GOVER: 1.14.12
+  GOVER: 1.15.7
 
 stages:
   - stage: VerifyBuild
diff --git a/ci/install_deps.yml b/ci/install_deps.yml
index aa00b94c3ca..db794a23e99 100644
--- a/ci/install_deps.yml
+++ b/ci/install_deps.yml
@@ -14,4 +14,4 @@ steps:
     inputs:
       version: $(GOVER)
       goPath:  $(GOPATH)
-    displayName: Install GoLang
+    displayName: Install Go
diff --git a/docs/source/dev-setup/devenv.rst b/docs/source/dev-setup/devenv.rst
index 48f7b2295d2..7f3b2b759ce 100644
--- a/docs/source/dev-setup/devenv.rst
+++ b/docs/source/dev-setup/devenv.rst
@@ -5,7 +5,7 @@ Prerequisites
 ~~~~~~~~~~~~~
 
 -  `Git client <https://git-scm.com/downloads>`__
--  `Go <https://golang.org/dl/>`__ version 1.14.x
+-  `Go <https://golang.org/dl/>`__ version 1.15.x
 -  `Docker <https://docs.docker.com/get-docker/>`__ version 18.03 or later
 -  (macOS) `Xcode Command Line Tools <https://developer.apple.com/downloads/>`__
 -  `SoftHSM <https://github.com/opendnssec/SoftHSMv2>`__
diff --git a/vagrant/golang.sh b/vagrant/golang.sh
index ec2411a72e3..1ab9f9b02ee 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.14.12
+GO_VERSION=1.15.7
 
 # ----------------------------------------------------------------
 # Install Golang