diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-27 12:27:48 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-07-27 12:27:48 +0300 |
| commit | 973fc1f2b985c808e442792238f2cddcc53005fe (patch) | |
| tree | 934dfed186634b7b079a68a5bd1de5ff1063c078 | |
| parent | 2150f1e92b4473bede670d2ac32d9b9f7e4d17a9 (diff) | |
| parent | 5ff293bf6c1098900974b0e3e5e619f90d9d56d7 (diff) | |
Merge branch 'smh-remove-legacy-go-mod' into 'master'
Remove legacy go.mod and go.sum files from _build directory
Closes #4381
See merge request gitlab-org/gitaly!4758
| -rw-r--r-- | Makefile | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -599,8 +599,15 @@ ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BUILD_DIR}/bin install "$<" "$@"; \ fi +# The build process left a go.mod and go.sum file in ${BUILD_DIR} in the past. This causes problems these days +# when attempting to embed the auxiliary binaries into Gitaly binary as they are considered to be in a different +# module due to this. Remove the legacy files. +.PHONY: remove-legacy-go-mod +remove-legacy-go-mod: + ${Q}rm -f $(addprefix ${BUILD_DIR}/, go.mod go.sum) + ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly: ${GITALY_PACKED_EXECUTABLES} +${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly-git2go-v15: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly-git2go-v15: libgit2 |