diff options
| author | John Cai <jcai@gitlab.com> | 2022-04-21 21:10:16 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2022-04-21 21:10:16 +0300 |
| commit | ecbd73dd72aabfd70c03e19f6cb8d338f7687470 (patch) | |
| tree | 8dd871300a30b369a529860d879adccab6dc279d | |
| parent | 1b1b95408d11a2532db5a44ffefd5cbab6e0effd (diff) | |
Makefile: upgrade Git to 2.36.0jc-upgrade-git-2.36
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -124,7 +124,7 @@ GIT_EXECUTABLES += git-http-backend # The default version is used in case the caller does not set the variable or # if it is either set to the empty string or "default". ifeq (${GIT_VERSION:default=},) - override GIT_VERSION := v2.35.1 + override GIT_VERSION := v2.36.0 # This extra version has two intentions: first, it allows us to detect # capabilities of the command at runtime. Second, it helps admins to @@ -137,7 +137,7 @@ ifeq (${GIT_VERSION:default=},) # Before adding custom patches, please read doc/PROCESS.md#Patching-git # first to make sure your patches meet our acceptance criteria. Patches # must be put into `_support/git-patches`. - GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.35.1.gl1/*)) + GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.36.0.gl1/*)) else # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab # use both. @@ -300,16 +300,16 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.33.1.gl2 build-bundled-git-v2.35.1.gl1 +build-bundled-git: build-bundled-git-v2.33.1.gl2 build-bundled-git-v2.36.0.gl1 build-bundled-git-v2.33.1.gl2: $(patsubst %,${BUILD_DIR}/bin/gitaly-%,${GIT_EXECUTABLES}) -build-bundled-git-v2.35.1.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1,${GIT_EXECUTABLES}) +build-bundled-git-v2.36.0.gl1: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1,${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.33.1.gl2 install-bundled-git-v2.35.1.gl1 +install-bundled-git: install-bundled-git-v2.33.1.gl2 install-bundled-git-v2.36.0.gl1 install-bundled-git-v2.33.1.gl2: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%,${GIT_EXECUTABLES}) -install-bundled-git-v2.35.1.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.35.1.gl1,${GIT_EXECUTABLES}) +install-bundled-git-v2.36.0.gl1: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.36.0.gl1,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT build: build-bundled-git @@ -575,10 +575,10 @@ ${BUILD_DIR}/bin/gitaly-%: override GIT_EXTRA_VERSION = gl3 ${BUILD_DIR}/bin/gitaly-%: ${DEPENDENCY_DIR}/git-v2.33.1.gl3/% | ${BUILD_DIR}/bin ${Q}install $< $@ -${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: override GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.35.1.gl1/*)) -${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: override GIT_VERSION = v2.35.1 -${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: override GIT_EXTRA_VERSION = gl1 -${BUILD_DIR}/bin/gitaly-%-v2.35.1.gl1: ${DEPENDENCY_DIR}/git-v2.35.1.gl1/% | ${BUILD_DIR}/bin +${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_PATCHES := $(sort $(wildcard ${SOURCE_DIR}/_support/git-patches/v2.36.0.gl1/*)) +${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_VERSION = v2.36.0 +${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: override GIT_EXTRA_VERSION = gl1 +${BUILD_DIR}/bin/gitaly-%-v2.36.0.gl1: ${DEPENDENCY_DIR}/git-v2.36.0.gl1/% | ${BUILD_DIR}/bin ${Q}install $< $@ ${INSTALL_DEST_DIR}/gitaly-%: ${BUILD_DIR}/bin/gitaly-% |