Merge branch 'pks-git-bump-minimum-required-version-v2.38' into 'master'

git: Bump minimum required Git version to v2.38.0

Closes #4672

See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5210

Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>

5 files changed, 11 insertions, 20 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8aad99d99..061d73052 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -179,7 +179,7 @@ build:
     matrix:
       - GO_VERSION: [ "1.18", "1.19" ]
         TEST_BOOT_ARGS: "--bundled-git"
-      - GIT_VERSION: "v2.37.0"
+      - GIT_VERSION: "v2.38.0"
 
 build:binaries:
   needs: []
@@ -216,7 +216,7 @@ test:
       # We also verify that things work as expected with a non-bundled Git
       # version matching our minimum required Git version.
       - TEST_TARGET: test
-        GIT_VERSION: "v2.37.0"
+        GIT_VERSION: "v2.38.0"
       # Execute tests with our minimum required Postgres version, as well. If
       # the minimum version changes, please change this to the new minimum
       # version. Furthermore, please make sure to update the minimum required
diff --git a/Makefile b/Makefile
index a7c99c230..e62fba480 100644
--- a/Makefile
+++ b/Makefile
@@ -132,8 +132,6 @@ GIT_EXECUTABLES += git-http-backend
 ## WITH_BUNDLED_GIT=YesPlease. Can be set to an arbitrary Git revision with
 ## tags, branches, and commit ids.
 GIT_VERSION ?=
-## The Git version used for bundled Git v2.37.
-GIT_VERSION_2_37_1 ?= v2.37.4.gl1
 ## The Git version used for bundled Git v2.38.
 GIT_VERSION_2_38 ?= v2.38.2.gl1
 
@@ -327,16 +325,13 @@ install: build
 
 .PHONY: build-bundled-git
 ## Build bundled Git binaries.
-build-bundled-git: build-bundled-git-v2.37.1.gl1
 build-bundled-git: build-bundled-git-v2.38
-build-bundled-git-v2.37.1.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.37.1.gl1,${GIT_EXECUTABLES})
 build-bundled-git-v2.38: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.38,${GIT_EXECUTABLES})
 
 .PHONY: install-bundled-git
 ## Install bundled Git binaries. The target directory can be modified by
 ## setting PREFIX and DESTDIR.
-install-bundled-git: install-bundled-git-v2.37.1.gl1 install-bundled-git-v2.38
-install-bundled-git-v2.37.1.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.37.1.gl1,${GIT_EXECUTABLES})
+install-bundled-git: install-bundled-git-v2.38
 install-bundled-git-v2.38: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.38,${GIT_EXECUTABLES})
 
 ifdef WITH_BUNDLED_GIT
@@ -569,10 +564,6 @@ ${DEPENDENCY_DIR}/git-distribution/git: ${DEPENDENCY_DIR}/git-distribution/Makef
 	${Q}env -u PROFILE -u MAKEFLAGS -u GIT_VERSION ${MAKE} -C "$(<D)" -j$(shell nproc) prefix=${GIT_PREFIX} ${GIT_BUILD_OPTIONS}
 	${Q}touch $@
 
-${BUILD_DIR}/bin/gitaly-%-v2.37.1.gl1: override GIT_VERSION = ${GIT_VERSION_2_37_1}
-${BUILD_DIR}/bin/gitaly-%-v2.37.1.gl1: ${DEPENDENCY_DIR}/git-v2.37.1.gl1/% | ${BUILD_DIR}/bin
-	${Q}install $< $@
-
 ${BUILD_DIR}/bin/gitaly-%-v2.38: override GIT_VERSION = ${GIT_VERSION_2_38}
 ${BUILD_DIR}/bin/gitaly-%-v2.38: ${DEPENDENCY_DIR}/git-v2.38/% | ${BUILD_DIR}/bin
 	${Q}install $< $@
diff --git a/README.md b/README.md
index 78ae39b3c..a16eb1a21 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ Most users won't install Gitaly on its own. It is already included in
 Gitaly requires Go 1.18 or Go 1.19 and Ruby 2.7. Run `make` to download and
 compile Ruby dependencies, and to compile the Gitaly Go executable.
 
-Gitaly uses `git`. Versions `2.37.0` and newer are supported.
+Gitaly uses `git`. Versions `2.38.0` and newer are supported.
 
 ## Configuration
 
diff --git a/internal/git/version.go b/internal/git/version.go
index 5bee93ccf..6dc533726 100644
--- a/internal/git/version.go
+++ b/internal/git/version.go
@@ -16,9 +16,9 @@ import (
 // - https://docs.gitlab.com/ee/install/installation.html#software-requirements
 // - https://docs.gitlab.com/ee/update/ (see e.g. https://docs.gitlab.com/ee/update/#1440)
 var minimumVersion = Version{
-	versionString: "2.37.0",
+	versionString: "2.38.0",
 	major:         2,
-	minor:         37,
+	minor:         38,
 	patch:         0,
 	rc:            false,
 
diff --git a/internal/git/version_test.go b/internal/git/version_test.go
index b7c5c6cd2..08f3e9a6e 100644
--- a/internal/git/version_test.go
+++ b/internal/git/version_test.go
@@ -109,11 +109,11 @@ func TestVersion_IsSupported(t *testing.T) {
 		{"2.24.0", false},
 		{"2.25.0", false},
 		{"2.32.0", false},
-		{"2.37.0-rc0", false},
-		{"2.37.0", true},
-		{"2.37.0.gl0", true},
-		{"2.37.0.gl1", true},
-		{"2.37.1", true},
+		{"2.38.0-rc0", false},
+		{"2.38.0", true},
+		{"2.38.0.gl0", true},
+		{"2.38.0.gl1", true},
+		{"2.38.1", true},
 		{"3.0.0", true},
 		{"3.0.0.gl5", true},
 	} {