Merge branch 'ps-update-git-2-24' into 'master'

Upgrade to Git 2.24

See merge request gitlab-org/gitaly!1653

5 files changed, 20 insertions, 7 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 922b59778..411af8927 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22
+image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24
 
 stages:
   - build
@@ -7,7 +7,7 @@ stages:
 
 variables:
   DOCKER_DRIVER: overlay2
-  CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.22
+  CUSTOM_IMAGE_VERSION: ruby-2.6-golang-1.13-git-2.24
 
 danger-review:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:danger
@@ -110,6 +110,10 @@ binaries_go1.12:
   <<: *assemble_definition
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21
 
+test:go1.13-git-2.21-ruby-2.6:
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.21
+  <<: *test_definition
+
 test:go1.13-git-2.22-ruby-2.6:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.22
   <<: *test_definition
@@ -118,8 +122,12 @@ test:go1.12-git-2.22-ruby-2.6:
   image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22
   <<: *test_definition
 
-test:go1.12-git-2.21-ruby-2.6:
-  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.21
+test:go1.13-git-2.24-ruby-2.6:
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24
+  <<: *test_definition
+
+test:go1.12-git-2.24-ruby-2.6:
+  image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.24
   <<: *test_definition
 
 test:proxy:
diff --git a/Dockerfile b/Dockerfile
index 32b36f8ba..8396ea028 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@
 # See the _support/load-cluster/docker-compose.yml for an example of how to use
 # this image
 #
-FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22
+FROM registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24
 
 RUN mkdir -p /app/ruby
 
diff --git a/README.md b/README.md
index c156914b4..a9a2d4017 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Gitaly requires Go 1.12.13 or newer and Ruby 2.6. Run `make` to download
 and compile Ruby dependencies, and to compile the Gitaly Go
 executable.
 
-Gitaly uses `git`. Versions `2.21.0` and `2.22.0` are supported.
+Gitaly uses `git`. Versions `2.21.0`, `2.22.0` and `2.24.0` are supported.
 
 ## Configuration
 
diff --git a/_support/instrumented-cluster/docker-compose.yml b/_support/instrumented-cluster/docker-compose.yml
index 51e0719ce..bcd491740 100644
--- a/_support/instrumented-cluster/docker-compose.yml
+++ b/_support/instrumented-cluster/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.4"
 
 services:
   gitaly1repos:
-    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.12-git-2.22
+    image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6-golang-1.13-git-2.24
     volumes:
       - gitalydata1:/repositories
       - ./gitaly1repos/setup.sh:/setup.sh
diff --git a/changelogs/unreleased/ps-update-git-2-24.yml b/changelogs/unreleased/ps-update-git-2-24.yml
new file mode 100644
index 000000000..680c6c6da
--- /dev/null
+++ b/changelogs/unreleased/ps-update-git-2-24.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade to Git 2.24
+merge_request: 1653
+author:
+type: deprecated