From cb96bb8bd32ce5f1a882b6d06a869a1a1925c57d Mon Sep 17 00:00:00 2001
From: mpl <mathieu.lonjaret@gmail.com>
Date: Mon, 2 Nov 2020 14:44:01 +0100
Subject: [PATCH] all: update to Go 1.15

---
 .github/workflows/tests-linux.yml   | 2 +-
 .github/workflows/tests-windows.yml | 2 +-
 Dockerfile                          | 4 ++--
 doc/release.txt                     | 5 +++++
 make.go                             | 2 +-
 misc/docker/go/Dockerfile           | 4 ++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tests-linux.yml b/.github/workflows/tests-linux.yml
index 813aa2b1f..66094ae3e 100644
--- a/.github/workflows/tests-linux.yml
+++ b/.github/workflows/tests-linux.yml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.x, 1.13.x]
+        go-version: [1.x, 1.15.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
 
diff --git a/.github/workflows/tests-windows.yml b/.github/workflows/tests-windows.yml
index 0a6a3b924..3f9ae65a4 100644
--- a/.github/workflows/tests-windows.yml
+++ b/.github/workflows/tests-windows.yml
@@ -5,7 +5,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.13.x]
+        go-version: [1.15.x]
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
 
diff --git a/Dockerfile b/Dockerfile
index 1a73e6080..3ce7fc77a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,11 +22,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		pkg-config \
                 libsqlite3-dev
 
-ENV GOLANG_VERSION 1.13.5
+ENV GOLANG_VERSION 1.15.3
 
 WORKDIR /usr/local
 RUN wget -O go.tgz https://dl.google.com/go/go${GOLANG_VERSION}.linux-amd64.tar.gz
-RUN echo "512103d7ad296467814a6e3f635631bd35574cab3369a97a323c9a585ccaa569 go.tgz" | sha256sum -c -
+RUN echo "010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d go.tgz" | sha256sum -c -
 RUN tar -zxvf go.tgz
 
 ENV GOROOT /usr/local/go
diff --git a/doc/release.txt b/doc/release.txt
index 6ccacec9f..8ee2b1138 100644
--- a/doc/release.txt
+++ b/doc/release.txt
@@ -1,3 +1,8 @@
+** How to build the perkeep/go image: **
+
+# TODO(mpl): make the tools build it.
+docker build -t perkeep/go ./misc/docker/go
+
 ** How to build the Perkeep server docker image (for the GCE launcher): **
 
 $ go run ./misc/docker/dock.go -rev=$GIT_REVISION -upload=true
diff --git a/make.go b/make.go
index 3e304ce54..c3371ce2c 100644
--- a/make.go
+++ b/make.go
@@ -898,7 +898,7 @@ func validateDirInGOPATH(dir string) error {
 }
 
 const (
-	goVersionMinor  = 13
+	goVersionMinor  = 15
 	gopherJSGoMinor = 12
 )
 
diff --git a/misc/docker/go/Dockerfile b/misc/docker/go/Dockerfile
index 0d774968c..d0e6648b3 100644
--- a/misc/docker/go/Dockerfile
+++ b/misc/docker/go/Dockerfile
@@ -7,8 +7,8 @@ RUN apt-get -y --no-install-recommends install ca-certificates libc6-dev
 RUN apt-get -y --no-install-recommends install git
 
 # Get Go stable release
-ENV GOLANG_VERSION 1.13.5
+ENV GOLANG_VERSION 1.15.3
 WORKDIR /tmp
 RUN curl -O https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz
-RUN echo '512103d7ad296467814a6e3f635631bd35574cab3369a97a323c9a585ccaa569  go'${GOLANG_VERSION}'.linux-amd64.tar.gz' | sha256sum -c
+RUN echo '010a88df924a81ec21b293b5da8f9b11c176d27c0ee3962dc1738d2352d3c02d  go'${GOLANG_VERSION}'.linux-amd64.tar.gz' | sha256sum -c
 RUN tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz