diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 139cd76..5bcebff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,6 +58,7 @@ 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.13-git-2.22 test: *test_custom +ruby-2.6-golang-1.13-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.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33 test: *test_custom @@ -110,6 +111,7 @@ 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.13-git-2.22: *build_and_deploy_custom +ruby-2.6-golang-1.13-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.11-git-2.22-chrome-73.0-node-12.x-yarn-1.16-postgresql-9.6-graphicsmagick-1.3.33: *build_and_deploy_custom diff --git a/scripts/custom-docker-build b/scripts/custom-docker-build index 6c5d2f8..07a4751 100755 --- a/scripts/custom-docker-build +++ b/scripts/custom-docker-build @@ -74,6 +74,10 @@ function print_git_args() { GIT_VERSION=2.22.0 GIT_DOWNLOAD_SHA256=a4b7e4365bee43caa12a38d646d2c93743d755d1cea5eab448ffb40906c9da0b ;; + 2.24) + GIT_VERSION=2.24.0 + GIT_DOWNLOAD_SHA256=ad11030d2eac656ee9e8862f56d1610550f7867181beff814c7712a99192e99d + ;; *) echo "Unknown git version $1"; exit 1; esac