From 2a7a78a8299fa5538e2a62d08d3f1c113b67ba3c Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <git@zjvandeweg.nl>
Date: Sun, 26 Aug 2018 09:31:30 +0200
Subject: [PATCH] Add Golang 1.11 for build images

Go released a new version this week; https://blog.golang.org/go1.11
which makes go 1.9 EOL. To remove that version from our testing matrix,
we should make sure we support 1.11 first.

This only creates the 1.11 build images, other projects need to do the
cascading changes.
---
 .gitlab-ci.yml              | 4 ++++
 scripts/custom-docker-build | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 277db17..4d8b7dd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,10 @@ ruby-2.4-golang-1.10-git-2.14 test: *test_custom
 ruby-2.4-golang-1.10-git-2.16 test: *test_custom
 ruby-2.4-golang-1.10-git-2.17 test: *test_custom
 ruby-2.4-golang-1.10-git-2.18 test: *test_custom
+ruby-2.4-golang-1.11-git-2.14 test: *test_custom
+ruby-2.4-golang-1.11-git-2.16 test: *test_custom
+ruby-2.4-golang-1.11-git-2.17 test: *test_custom
+ruby-2.4-golang-1.11-git-2.18 test: *test_custom
 
 # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml
 ruby-2.4.4-golang-1.9-git-2.18-chrome-65.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom
diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build
index 296c272..8844e4a 100755
--- a/scripts/custom-docker-build
+++ b/scripts/custom-docker-build
@@ -18,6 +18,10 @@ function print_golang_args() {
             INSTALL_GOLANG_VERSION=1.10
             GOLANG_DOWNLOAD_SHA256=b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33
             ;;
+        1.11)
+            INSTALL_GOLANG_VERSION=1.11
+            GOLANG_DOWNLOAD_SHA256=b3fcf280ff86558e0559e185b601c9eade0fd24c900b4c63cd14d1d38613e499
+            ;;
         *) echo "Unknown golang version $1"; exit 1;
     esac
 
@@ -102,7 +106,7 @@ function print_git_args() {
         2.18)
             GIT_VERSION=2.18.0
             GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4
-            ;;            
+            ;;
         *) echo "Unknown git version $1"; exit 1;
     esac