diff options
| author | John Cai <jcai@gitlab.com> | 2023-04-20 22:06:03 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2023-05-22 21:17:45 +0300 |
| commit | 3fb282e70d977a8224636818996cdb6ced7292e1 (patch) | |
| tree | 38a1246bbf66feaec33dbdcb41321aab8e9d174f /Makefile | |
| parent | 11f2edad4f6fcab19e8f20a81110c57850915173 (diff) | |
Makefile: Stop building git 2.39
Now that we have removed the flag to use 2.40 in production, stop
building version 2.39.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
@@ -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.39. -GIT_VERSION_2_39 ?= v2.39.3.gl1 ## The Git version used for bundled Git v2.40. GIT_VERSION_2_40 ?= v2.40.1.gl2 @@ -334,15 +332,13 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.39 build-bundled-git-v2.40 -build-bundled-git-v2.39: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.39,${GIT_EXECUTABLES}) +build-bundled-git: build-bundled-git-v2.40 build-bundled-git-v2.40: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.40,${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.39 install-bundled-git-v2.40 -install-bundled-git-v2.39: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.39,${GIT_EXECUTABLES}) +install-bundled-git: install-bundled-git-v2.40 install-bundled-git-v2.40: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.40,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT @@ -564,10 +560,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.39: override GIT_VERSION = ${GIT_VERSION_2_39} -${BUILD_DIR}/bin/gitaly-%-v2.39: ${DEPENDENCY_DIR}/git-v2.39/% | ${BUILD_DIR}/bin - ${Q}install $< $@ - ${BUILD_DIR}/bin/gitaly-%-v2.40: override GIT_VERSION = ${GIT_VERSION_2_40} ${BUILD_DIR}/bin/gitaly-%-v2.40: ${DEPENDENCY_DIR}/git-v2.40/% | ${BUILD_DIR}/bin ${Q}install $< $@ |