From 15756dc1b90f9e1768ceb7f064c53975f4b28f6e Mon Sep 17 00:00:00 2001 From: Paul Okstad Date: Tue, 2 Jun 2020 07:10:08 +0000 Subject: [PATCH] Update Gitaly build images - Adds Git v2.25 and v2.27 (see https://gitlab.com/gitlab-org/gitaly/-/issues/2773) - Removes Git v2.22 (no longer used by Gitaly) - Removes Go v1.12 (no longer used by Gitaly) --- .gitlab-ci.yml | 19 ++++++++----------- scripts/custom-docker-build | 8 ++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 415202a..91d565b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,16 +60,14 @@ 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.12-git-2.22 test: *test_custom -ruby-2.6-golang-1.12-git-2.24 test: *test_custom -ruby-2.6-golang-1.12-git-2.26 test: *test_custom -ruby-2.6-golang-1.13-git-2.22 test: *test_custom ruby-2.6-golang-1.13-git-2.24 test: *test_custom +ruby-2.6-golang-1.13-git-2.25 test: *test_custom ruby-2.6-golang-1.13-git-2.26 test: *test_custom -ruby-2.6-golang-1.14-git-2.22 test: *test_custom +ruby-2.6-golang-1.13-git-2.27 test: *test_custom ruby-2.6-golang-1.14-git-2.24 test: *test_custom +ruby-2.6-golang-1.14-git-2.25 test: *test_custom ruby-2.6-golang-1.14-git-2.26 test: *test_custom +ruby-2.6-golang-1.14-git-2.27 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.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34 test: *test_custom @@ -121,15 +119,14 @@ golangci-lint-alpine 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.12-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.12-git-2.26: *build_and_deploy_custom -ruby-2.6-golang-1.13-git-2.22: *build_and_deploy_custom ruby-2.6-golang-1.13-git-2.24: *build_and_deploy_custom +ruby-2.6-golang-1.13-git-2.25: *build_and_deploy_custom ruby-2.6-golang-1.13-git-2.26: *build_and_deploy_custom -ruby-2.6-golang-1.14-git-2.22: *build_and_deploy_custom +ruby-2.6-golang-1.13-git-2.27: *build_and_deploy_custom ruby-2.6-golang-1.14-git-2.24: *build_and_deploy_custom +ruby-2.6-golang-1.14-git-2.25: *build_and_deploy_custom ruby-2.6-golang-1.14-git-2.26: *build_and_deploy_custom +ruby-2.6-golang-1.14-git-2.27: *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.26-lfs-2.9-chrome-83-node-12.x-yarn-1.21-postgresql-11-graphicsmagick-1.3.34: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 97f87d4..34727ee 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -81,10 +81,18 @@ function print_git_args() { GIT_VERSION=2.24.3 GIT_DOWNLOAD_SHA256=ef6d1d1de1d7921a54d23d07479bd2766f050d6435cea5d3b5322aa4897cb3d7 ;; + 2.25) + GIT_VERSION=2.25.4 + GIT_DOWNLOAD_SHA256=1b11d0ee481c6735e9f7d81a3576ef0989bde7843cb4adcdef578c0593d279ab + ;; 2.26) GIT_VERSION=2.26.2 GIT_DOWNLOAD_SHA256=e1c17777528f55696815ef33587b1d20f5eec246669f3b839d15dbfffad9c121 ;; + 2.27) + GIT_VERSION=2.27.0 + GIT_DOWNLOAD_SHA256=77ded85cbe42b1ffdc2578b460a1ef5d23bcbc6683eabcafbb0d394dffe2e787 + ;; *) echo "Unknown git version $1"; exit 1; esac