Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2022-03-25 12:24:13 +0300
committerToon Claes <toon@gitlab.com>2022-03-25 12:24:13 +0300
commitdc6b6e06ba50fe2e2cb28e2ad2819e4daf160cf4 (patch)
tree5df2303eb24e65d58bfab13d81e5648afa2208cf
parent57761a33a63a8cda40a137d487db1b4d3dd4acf8 (diff)
Makefile: Remove root binary cleanup
We used to install Gitaly binaries into the source directory by default when executing "make" or "make all", which has been changed in v14.5 to only build binaries into `_build/bin`. In order to quickly fail in case any source install still refers to these old binaries, we delete them from the source directory. Otherwise, it may happen that a source install continues to use the old set of binaries that wasn't updated at all. This safety guard has been around for long enough, so we can remove it now.
-rw-r--r--Makefile7
1 files changed, 0 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index b6372e551..aa8cf9c6f 100644
--- a/Makefile
+++ b/Makefile
@@ -315,13 +315,6 @@ help:
.PHONY: build
## Build Go binaries and install required Ruby Gems.
build: ${SOURCE_DIR}/.ruby-bundle libgit2
- @ # We used to install Gitaly binaries into the source directory by default when executing
- @ # "make" or "make all", which has been changed in v14.5 to only build binaries into
- @ # `_build/bin`. In order to quickly fail in case any source install still refers to these
- @ # old binaries, we delete them from the source directory. Otherwise, it may happen that a
- @ # source install continues to use the old set of binaries that wasn't updated at all.
- @ # This safety guard can go away in v14.6.
- ${Q}rm -f $(addprefix ${SOURCE_DIR}/,$(notdir $(call find_commands)) gitaly-git2go-v14)
ifdef WITHOUT_BUILD_ID
go install -ldflags '${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))