From c866076facb49dc8b01d171e2cde08dde8e9b443 Mon Sep 17 00:00:00 2001
From: Paul Okstad <pokstad@gitlab.com>
Date: Tue, 1 Dec 2020 08:29:15 +0000
Subject: [PATCH] Add Golang 1.15.5 to build containers

---
 .gitlab-ci.yml              | 24 ++++++++++++------------
 scripts/custom-docker-build |  4 ++++
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eceaa8f..69cbeec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -60,15 +60,15 @@ variables:
 node-10 test: *test_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.28 test: *test_custom
 ruby-2.6-golang-1.14-git-2.28 test: *test_custom
-ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
-ruby-2.7-golang-1.13-git-2.28 test: *test_custom
-ruby-2.7-golang-1.13-git-2.29 test: *test_custom
+ruby-2.6-golang-1.15-git-2.28 test: *test_custom
+ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
 ruby-2.7-golang-1.14-git-2.28 test: *test_custom
-ruby-2.7-golang-1.14-git-2.28-pgbouncer-1.14 test: *test_custom
+ruby-2.7-golang-1.15-git-2.28 test: *test_custom
+ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14 test: *test_custom
 ruby-2.7-golang-1.14-git-2.29 test: *test_custom
-ruby-2.7-golang-1.14-git-2.29-pgbouncer-1.14 test: *test_custom
+ruby-2.7-golang-1.15-git-2.29 test: *test_custom
+ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14 test: *test_custom
 
 # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml
 ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-postgresql-11-graphicsmagick-1.3.34 test: *test_custom
@@ -141,15 +141,15 @@ gitlab-operator-build-base test: *test_build
 node-10: *build_and_deploy_custom
 
 # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml
-ruby-2.6-golang-1.13-git-2.28: *build_and_deploy_custom
 ruby-2.6-golang-1.14-git-2.28: *build_and_deploy_custom
-ruby-2.6-golang-1.14-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
-ruby-2.7-golang-1.13-git-2.28: *build_and_deploy_custom
-ruby-2.7-golang-1.13-git-2.29: *build_and_deploy_custom
+ruby-2.6-golang-1.15-git-2.28: *build_and_deploy_custom
+ruby-2.6-golang-1.15-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
 ruby-2.7-golang-1.14-git-2.28: *build_and_deploy_custom
-ruby-2.7-golang-1.14-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.28: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.28-pgbouncer-1.14: *build_and_deploy_custom
 ruby-2.7-golang-1.14-git-2.29: *build_and_deploy_custom
-ruby-2.7-golang-1.14-git-2.29-pgbouncer-1.14: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.29: *build_and_deploy_custom
+ruby-2.7-golang-1.15-git-2.29-pgbouncer-1.14: *build_and_deploy_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.6.6-golang-1.14-git-2.28-lfs-2.9-chrome-85-node-12.18-yarn-1.22-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index ff9c8d5..85a21a5 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -19,6 +19,10 @@ function print_golang_args() {
             INSTALL_GOLANG_VERSION=1.14.1
             GOLANG_DOWNLOAD_SHA256=2f49eb17ce8b48c680cdb166ffd7389702c0dec6effa090c324804a5cac8a7f8
             ;;
+        1.15)
+            INSTALL_GOLANG_VERSION=1.15.5
+            GOLANG_DOWNLOAD_SHA256=9a58494e8da722c3aef248c9227b0e9c528c7318309827780f16220998180a0d
+            ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac