From db4081aa36e24e71fafd742c710fa668fe29dd4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20Carlb=C3=A4cker?= Date: Wed, 31 Jan 2018 16:31:43 +0000 Subject: [PATCH] We need go1.8 for Gitaly --- .gitlab-ci.yml | 8 ++++++++ scripts/custom-docker-build | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 31c88f4..f5880a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -47,10 +47,14 @@ before_script: # Tests +ruby-2.3-golang-1.8-git-2.14 test: *test_custom +ruby-2.3-golang-1.8-git-2.9 test: *test_custom ruby-2.3-golang-1.9-git-2.14 test: *test_custom ruby-2.3-golang-1.9-git-2.9 test: *test_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6 test: *test_custom +golang-1.8.6-git-2.9.0 test: *test_custom +golang-1.8.6-git-2.14 test: *test_custom golang-1.9-git-2.9.0 test: *test_custom golang-1.9-git-2.14 test: *test_custom node-8.9-chrome-64.0-yarn-1.2 test: *test_custom @@ -68,10 +72,14 @@ omnibus-gitlab-xenial test: *test_build # Builds +ruby-2.3-golang-1.8.6-git-2.14: *build_and_deploy_custom +ruby-2.3-golang-1.8.6-git-2.9: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.14: *build_and_deploy_custom ruby-2.3-golang-1.9-git-2.9: *build_and_deploy_custom ruby-2.3.5-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom ruby-2.3.6-golang-1.9-git-2.14-chrome-64.0-node-8.x-yarn-1.2-postgresql-9.6: *build_and_deploy_custom +golang-1.8.6-git-2.9.0: *build_and_deploy_custom +golang-1.8.6-git-2.14: *build_and_deploy_custom golang-1.9-git-2.9.0: *build_and_deploy_custom golang-1.9-git-2.14: *build_and_deploy_custom node-8.9-chrome-64.0-yarn-1.2: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 736a632..4f711ff 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -7,8 +7,8 @@ function print_golang_args() { case "$1" in 1.8) - INSTALL_GOLANG_VERSION=1.8 - GOLANG_DOWNLOAD_SHA256=253ab94104ee3923e228a2cb2116e5e462ad3ebaeea06ff04463479d7f12d27ca + INSTALL_GOLANG_VERSION=1.8.6 + GOLANG_DOWNLOAD_SHA256=f558c91c2f6aac7222e0bd83e6dd595b8fac85aaa96e55d15229542eb4aaa1ff ;; 1.9) INSTALL_GOLANG_VERSION=1.9.2