diff options
| author | Toon Claes <toon@gitlab.com> | 2022-04-11 23:21:23 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2022-04-14 21:42:51 +0300 |
| commit | c543e03696eec58c6670a3ef8e0931c13d7c8a4c (patch) | |
| tree | bc8c68d7307dde1b66693e777a11102e20c9f065 | |
| parent | c311109b15c26e1981c855bfa5c87aef02d27560 (diff) | |
Makefile: Make GITALY_EXECUTABLES deferred again
Recently, in b5c9c7efc (Makefile: Rename find_commands to
GITALY_EXECUTABLES, 2022-03-25), we've changed the variable that holds
the names of all Gitaly executable to be an immediate variable. While
this is a good idea in general, it causes trouble in CI. In CI the
compiled executables are put in cache, but the source files are not. So
when files are pulled from cache, and any make target is built, it will
expand GITALY_EXECUTABLES. Now source files are not pulled from the
cache, so the `cmd` directory is missing. And therefore we revert it
back to be a deferred variable.
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -210,7 +210,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 := $(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) +GITALY_EXECUTABLES = $(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) # Find all Go source files. find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) |