diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -130,8 +130,6 @@ GIT_EXECUTABLES += git-http-backend GIT_VERSION ?= ## The Git version used for bundled Git v2.41. GIT_VERSION_2_41 ?= v2.41.0.gl1 -## The Git version used for bundled Git v2.42. -GIT_VERSION_2_42 ?= v2.42.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 @@ -322,16 +320,14 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.42 +build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.41: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.41,${GIT_EXECUTABLES}) -build-bundled-git-v2.42: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.42,${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.41 install-bundled-git-v2.42 +install-bundled-git: install-bundled-git-v2.41 install-bundled-git-v2.41: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.41,${GIT_EXECUTABLES}) -install-bundled-git-v2.42: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.42,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT build: build-bundled-git @@ -425,6 +421,10 @@ test-with-praefect-wal: test-with-praefect race-go: override TEST_OPTIONS := ${TEST_OPTIONS} -race race-go: test-go +## Running the verify steps in parallel make it difficult to read the output +## when there are failures. +.NOTPARALLEL: verify + .PHONY: verify ## Verify that various files conform to our expectations. verify: check-mod-tidy notice-up-to-date check-proto lint @@ -578,10 +578,6 @@ ${BUILD_DIR}/bin/gitaly-%-v2.41: override GIT_VERSION = ${GIT_VERSION_2_41} ${BUILD_DIR}/bin/gitaly-%-v2.41: ${DEPENDENCY_DIR}/git-v2.41/% | ${BUILD_DIR}/bin ${Q}install $< $@ -${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/%: ${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", |