From ad0c9cc73e14aa732d402e8cd19c44fc31d6c699 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 8 Jul 2019 09:27:19 +0200 Subject: [PATCH] Bump Git version for Gitaly to 2.22 Gitaly runs on anything beyond 2.21, and will remain to do so until partial clone will be supported. In 2.22 a security issue was fixed, so that's the minimal version Gitaly should use. Part of: https://gitlab.com/gitlab-org/gitaly/issues/1715 --- .gitlab-ci.yml | 17 +++++++++-------- scripts/custom-docker-build | 4 ++++ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba3443f..88ab098 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,10 +56,11 @@ before_script: node-10 test: *test_custom # Used by Gitaly: https://gitlab.com/gitlab-org/gitaly/blob/master/.gitlab-ci.yml -ruby-2.5-golang-1.11-git-2.21 test: *test_custom -ruby-2.6-golang-1.11-git-2.21 test: *test_custom -ruby-2.5-golang-1.12-git-2.21 test: *test_custom -ruby-2.6-golang-1.12-git-2.21 test: *test_custom +ruby-2.5-golang-1.11-git-2.22 test: *test_custom +ruby-2.6-golang-1.11-git-2.22 test: *test_custom +ruby-2.5-golang-1.12-git-2.22 test: *test_custom +ruby-2.6-golang-1.12-git-2.22 test: *test_custom + # Used by GitLab CE/EE: https://gitlab.com/gitlab-org/gitlab-ee/blob/master/.gitlab-ci.yml ruby-2.6.3-golang-1.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29 test: *test_custom @@ -104,10 +105,10 @@ gitlab-docs-lint 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.5-golang-1.11-git-2.21: *build_and_deploy_custom -ruby-2.6-golang-1.11-git-2.21: *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.21: *build_and_deploy_custom +ruby-2.5-golang-1.11-git-2.22: *build_and_deploy_custom +ruby-2.6-golang-1.11-git-2.22: *build_and_deploy_custom +ruby-2.5-golang-1.12-git-2.22: *build_and_deploy_custom +ruby-2.6-golang-1.12-git-2.22: *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.11-git-2.21-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.29: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 3ccfb34..bd43569 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -66,6 +66,10 @@ function print_git_args() { GIT_VERSION=2.21.0 GIT_DOWNLOAD_SHA256=85eca51c7404da75e353eba587f87fea9481ba41e162206a6f70ad8118147bee ;; + 2.22) + GIT_VERSION=2.22.0 + GIT_DOWNLOAD_SHA256=a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b + ;; *) echo "Unknown git version $1"; exit 1; esac