From 779d9744a8ae34bf68c9aae21ee51f353b8742ab Mon Sep 17 00:00:00 2001
From: Peter Mattis <petermattis@gmail.com>
Date: Fri, 11 Jan 2019 11:13:37 -0500
Subject: [PATCH] builder: upgrade to go1.11.4

Bump the minimum version to go1.11.

Fixes #33283

Release note (general change): Upgrade the build environment to use
go1.11.4.
---
 build/bootstrap/bootstrap-debian.sh | 6 +++---
 build/builder.sh                    | 2 +-
 build/builder/Dockerfile            | 4 ++--
 build/go-version-check.sh           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/bootstrap/bootstrap-debian.sh b/build/bootstrap/bootstrap-debian.sh
index 342abccabd68..5f06e55b295a 100755
--- a/build/bootstrap/bootstrap-debian.sh
+++ b/build/bootstrap/bootstrap-debian.sh
@@ -37,9 +37,9 @@ echo '. ~/.bashrc_bootstrap' >> ~/.bashrc
 
 # Install Go.
 trap 'rm -f /tmp/go.tgz' EXIT
-curl https://dl.google.com/go/go1.10.3.linux-amd64.tar.gz > /tmp/go.tgz
-sha256sum - <<EOF
-fa1b0e45d3b647c252f51f5e1204aba049cde4af177ef9f2181f43004f901035  /tmp/go.tgz
+curl https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz > /tmp/go.tgz
+sha256sum -c - <<EOF
+fb26c30e6a04ad937bbc657a1b5bba92f80096af1e8ee6da6430c045a8db3a5b  /tmp/go.tgz
 EOF
 sudo tar -C /usr/local -zxf /tmp/go.tgz
 
diff --git a/build/builder.sh b/build/builder.sh
index 6b3f6058fb44..5cd2c3900d41 100755
--- a/build/builder.sh
+++ b/build/builder.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 image=cockroachdb/builder
-version=20181215-085602
+version=20190111-111249
 
 function init() {
   docker build --tag="${image}" "$(dirname "${0}")/builder"
diff --git a/build/builder/Dockerfile b/build/builder/Dockerfile
index 353b4e16d691..1cff4ec1b0fe 100644
--- a/build/builder/Dockerfile
+++ b/build/builder/Dockerfile
@@ -182,8 +182,8 @@ RUN git clone git://git.sv.gnu.org/sed \
 # releases of Go will no longer be run in CI once it is changed. Consider
 # bumping the minimum allowed version of Go in /build/go-version-chech.sh.
 RUN apt-get install -y --no-install-recommends golang \
- && curl -fsSL https://storage.googleapis.com/golang/go1.10.7.src.tar.gz -o golang.tar.gz \
- && echo 'b84a0d7c90789f3a2ec5349dbe7419efb81f1fac9289b6f60df86bd919bd4447 golang.tar.gz' | sha256sum -c - \
+ && curl -fsSL https://storage.googleapis.com/golang/go1.11.4.src.tar.gz -o golang.tar.gz \
+ && echo '4cfd42720a6b1e79a8024895fa6607b69972e8e32446df76d6ce79801bbadb15 golang.tar.gz' | sha256sum -c - \
  && tar -C /usr/local -xzf golang.tar.gz \
  && rm golang.tar.gz \
  && cd /usr/local/go/src \
diff --git a/build/go-version-check.sh b/build/go-version-check.sh
index 16ea3b0304ee..aa96b9373337 100755
--- a/build/go-version-check.sh
+++ b/build/go-version-check.sh
@@ -6,7 +6,7 @@
 # To bump the required version of Go, edit the appropriate variables:
 
 required_version_major=1
-minimum_version_minor=10
+minimum_version_minor=11
 
 go=${1-go}