From 6f5b66279d7418b9bad9e886fa715af4033c7f5a Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Fri, 20 Mar 2020 09:57:46 +0000 Subject: [PATCH] Remove unused versions of Golang Versions 1.11 and older are effectively dead, given the Go project maintains the last two minor point releases which are currently 1.13, and 1.14. Gitaly for now still supports 1.12, but will move on to at least 1.13 soon. Which is why 1.12 is still supported by this script. --- .gitlab-ci.yml | 2 ++ scripts/custom-docker-build | 16 ++++------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 105bcbe..e3e8794 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -72,6 +72,7 @@ ruby-2.6-golang-1.12-git-2.22 test: *test_custom ruby-2.6-golang-1.13-git-2.22 test: *test_custom ruby-2.6-golang-1.12-git-2.24 test: *test_custom ruby-2.6-golang-1.13-git-2.24 test: *test_custom +ruby-2.6-golang-1.14-git-2.24 test: *test_custom # Used by GitLab: https://gitlab.com/gitlab-org/gitlab/blob/master/.gitlab-ci.yml ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34 test: *test_custom @@ -134,6 +135,7 @@ ruby-2.6-golang-1.12-git-2.22: *build_and_deploy_custom ruby-2.6-golang-1.13-git-2.22: *build_and_deploy_custom ruby-2.6-golang-1.12-git-2.24: *build_and_deploy_custom ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom +ruby-2.6-golang-1.14-git-2.24: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.6.3-golang-1.12-git-2.22-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 5c5c2ba..e4f46ed 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -8,18 +8,6 @@ source scripts/build-helpers.sh function print_golang_args() { case "$1" in - 1.9) - INSTALL_GOLANG_VERSION=1.9.4 - GOLANG_DOWNLOAD_SHA256=15b0937615809f87321a457bb1265f946f9f6e736c563d6c5e0bd2c22e44f779 - ;; - 1.10|1.10.0) - INSTALL_GOLANG_VERSION=1.10 - GOLANG_DOWNLOAD_SHA256=b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33 - ;; - 1.11) - INSTALL_GOLANG_VERSION=1.11.10 - GOLANG_DOWNLOAD_SHA256=aefaa228b68641e266d1f23f1d95dba33f17552ba132878b65bb798ffa37e6d0 - ;; 1.12) INSTALL_GOLANG_VERSION=1.12.13 GOLANG_DOWNLOAD_SHA256=da036454cb3353f9f507f0ceed4048feac611065e4e1818b434365eb32ac9bdc @@ -28,6 +16,10 @@ function print_golang_args() { INSTALL_GOLANG_VERSION=1.13.4 GOLANG_DOWNLOAD_SHA256=692d17071736f74be04a72a06dab9cac1cd759377bd85316e52b2227604c004c ;; + 1.14) + INSTALL_GOLANG_VERSION=1.14.1 + GOLANG_DOWNLOAD_SHA256=2f49eb17ce8b48c680cdb166ffd7389702c0dec6effa090c324804a5cac8a7f8 + ;; *) echo "Unknown golang version $1"; exit 1; esac