From b1ecdbffc5d18c4931504772c72ea5d8011c2b00 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Tue, 5 Mar 2019 11:56:01 +0000 Subject: [PATCH] Add Gitaly CI image with Git 2.21 --- .gitlab-ci.yml | 2 ++ scripts/custom-docker-build | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a03846..9f7f6c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,7 @@ ruby-2.5-golang-1.10-git-2.18 test: *test_custom ruby-2.5-golang-1.11-git-2.18 test: *test_custom ruby-2.6-golang-1.11-git-2.18 test: *test_custom ruby-2.5-golang-1.12-git-2.18 test: *test_custom +ruby-2.5-golang-1.12-git-2.21 test: *test_custom ruby-2.6-golang-1.12-git-2.18 test: *test_custom @@ -117,6 +118,7 @@ ruby-2.5-golang-1.10-git-2.18: *build_and_deploy_custom ruby-2.5-golang-1.11-git-2.18: *build_and_deploy_custom ruby-2.6-golang-1.11-git-2.18: *build_and_deploy_custom ruby-2.5-golang-1.12-git-2.18: *build_and_deploy_custom +ruby-2.5-golang-1.12-git-2.21: *build_and_deploy_custom ruby-2.6-golang-1.12-git-2.18: *build_and_deploy_custom # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 68d2e71..3f031d4 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -123,6 +123,10 @@ function print_git_args() { GIT_VERSION=2.18.0 GIT_DOWNLOAD_SHA256=94faf2c0b02a7920b0b46f4961d8e9cad08e81418614102898a55f980fa3e7e4 ;; + 2.21) + GIT_VERSION=2.21.0 + GIT_DOWNLOAD_SHA256=85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee + ;; *) echo "Unknown git version $1"; exit 1; esac