diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-25 16:48:36 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-02 08:38:48 +0300 |
| commit | 5603ccdfe214ec6655d91ba43dacad61f0d3f937 (patch) | |
| tree | 9efec1172b56f25188861348c81a5b05c8607448 | |
| parent | 77a9ffb75a6011de79f1b8d0a66ac24d903ab61c (diff) | |
Remove gitaly-git2go-v14 build from Makefile
Makefile contains a target for building a gitaly-git2go-v14 executable.
This is an older version of the gitaly-git2go-v15 so the old executable
stays around for backwards compatibility reasons throughout a major
version upgrade. Since we are now deploying the binaries as a single unit
packed inside the main gitaly binary, we no longer need to maintain backwards
compatibility. Remove the unnecessary target.
| -rw-r--r-- | Makefile | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -252,7 +252,7 @@ TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test.git BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git # All executables provided by Gitaly. -GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) gitaly-git2go-v14) +GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) # All executables packed inside the Gitaly binary. GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go-v15 %gitaly-ssh %gitaly-lfs-smudge, ${GITALY_EXECUTABLES}) # All executables that should be installed. @@ -631,16 +631,6 @@ ${BUILD_DIR}/intermediate/%: clear-go-build-cache-if-needed .FOR @ # the computed build ID for this binary. ${Q}go build -o "$@" -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" $(addprefix ${SOURCE_DIR}/cmd/,$(@F)) -# This target is required for backwards compatibility during zero-downtime -# upgrades and can be removed when v15.0 has been released. -${BUILD_DIR}/intermediate/gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly-git2go-v14: libgit2 -${BUILD_DIR}/intermediate/gitaly-git2go-v14: .FORCE - @ # gitaly-git2go-v14 pulls directly from a commit sha so that the gitaly-git2go-v14 - @ # binary can continue to be installed for the sake of zero downtime - @ # upgrades. - ${Q}GOBIN="$(dir $@)" go install -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14@c7c7c936c302ab435a0a56fbc19cfbd9bea0c835" - # This is a build hack to avoid excessive rebuilding of targets. Instead of # depending on the Makefile, we start to depend on tool versions as defined in # the Makefile. Like this, we only rebuild if the tool versions actually |