diff options
| author | Toon Claes <toon@gitlab.com> | 2023-12-18 12:23:28 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2023-12-19 16:58:39 +0300 |
| commit | f43da6dde3725ad6b8d34fd5f9b66cc73ec1c48f (patch) | |
| tree | 9598c1b0bac0e86d8551d9db6c3f0c7e5ba27c8d /Makefile | |
| parent | f16371d5ac5d20617380df435803f6c9c7ced564 (diff) | |
git: Add bundled Git version 2.43
Add Git version 2.43 to the installed bundled Git versions. Use this new
version of Git when feature flag `git_v243` is enabled.
Roll-out-issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5739
Issue: https://gitlab.com/gitlab-org/gitaly/-/issues/5713
Label: maintenance::dependency
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -128,6 +128,8 @@ GIT_EXECUTABLES += git-http-backend GIT_VERSION ?= ## The Git version used for bundled Git v2.42. GIT_VERSION_2_42 ?= v2.42.0 +## The Git version used for bundled Git v2.43. +GIT_VERSION_2_43 ?= v2.43.0 ## Skip overriding the Git version and instead use the Git version as specified ## in the Git sources. This is required when building Git from a version that @@ -280,14 +282,16 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.42 +build-bundled-git: build-bundled-git-v2.42 build-bundled-git-v2.43 build-bundled-git-v2.42: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.42,${GIT_EXECUTABLES}) +build-bundled-git-v2.43: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.43,${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.42 +install-bundled-git: install-bundled-git-v2.42 install-bundled-git-v2.43 install-bundled-git-v2.42: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.42,${GIT_EXECUTABLES}) +install-bundled-git-v2.43: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.43,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT build: build-bundled-git @@ -534,6 +538,10 @@ ${BUILD_DIR}/bin/gitaly-%-v2.42: override GIT_VERSION = ${GIT_VERSION_2_42} ${BUILD_DIR}/bin/gitaly-%-v2.42: ${DEPENDENCY_DIR}/git-v2.42/% | ${BUILD_DIR}/bin ${Q}install $< $@ +${BUILD_DIR}/bin/gitaly-%-v2.43: override GIT_VERSION = ${GIT_VERSION_2_43} +${BUILD_DIR}/bin/gitaly-%-v2.43: ${DEPENDENCY_DIR}/git-v2.43/% | ${BUILD_DIR}/bin + ${Q}install $< $@ + ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BUILD_DIR}/bin @ # To compute a unique and deterministic value for GNU build-id, we use an @ # intermediate binary which has a fixed build ID of "TEMP_GITALY_BUILD_ID", |