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:
authorPatrick Steinhardt <psteinhardt@gitlab.com>2021-09-07 08:51:56 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2021-09-07 09:10:54 +0300
commit612a67c82636b4057347de587b0f8ce230df616f (patch)
tree061b095f1665a0fed9c44e5bcad6adaf975ad3af /Makefile
parent506a21d8dc42b3187ba75d7e007839d07cc97b85 (diff)
Makefile: Silence non-primary build steps
A rough rule we have for our Makefile is that all steps which aren't producing the primary target of the rule and which are comparatively short-lived should be silenced. We have a bunch of steps which aren't currently following this rule, so let's silence them now.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile34
1 files changed, 17 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index dd0eebdc8..38ffbce2c 100644
--- a/Makefile
+++ b/Makefile
@@ -258,10 +258,10 @@ help:
## Build Go binaries and install required Ruby Gems.
build: ${SOURCE_DIR}/.ruby-bundle libgit2
go install ${GO_LDFLAGS} -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $(call find_commands))
- # We use version suffix for the gitaly-git2go binary to support compatibility contract between
- # gitaly and gitaly-git2go during upgrade deployment.
- # For more information refer to https://gitlab.com/gitlab-org/gitaly/-/issues/3647#note_599082033
- mv ${BUILD_DIR}/bin/gitaly-git2go "${BUILD_DIR}/bin/gitaly-git2go-${MODULE_VERSION}"
+ ${Q}# We use version suffix for the gitaly-git2go binary to support compatibility contract between
+ ${Q}# gitaly and gitaly-git2go during upgrade deployment.
+ ${Q}# For more information refer to https://gitlab.com/gitlab-org/gitaly/-/issues/3647#note_599082033
+ ${Q}mv ${BUILD_DIR}/bin/gitaly-git2go "${BUILD_DIR}/bin/gitaly-git2go-${MODULE_VERSION}"
.PHONY: install
## Install Gitaly binaries. The target directory can be modified by setting PREFIX and DESTDIR.
@@ -499,9 +499,9 @@ ${GIT_INSTALL_DIR}/bin/git: ${DEPENDENCY_DIR}/git.version
ifneq (${GIT_PATCHES},)
${Q}${GIT} -C "${GIT_SOURCE_DIR}" apply $(addprefix "${SOURCE_DIR}"/_support/git-patches/,${GIT_PATCHES})
endif
- # We're writing the version into the "version" file in Git's own source
- # directory. If it exists, Git's Makefile will pick it up and use it as
- # the version instead of auto-detecting via git-describe(1).
+ ${Q}# We're writing the version into the "version" file in Git's own source
+ ${Q}# directory. If it exists, Git's Makefile will pick it up and use it as
+ ${Q}# the version instead of auto-detecting via git-describe(1).
ifneq (${GIT_EXTRA_VERSION},0)
${Q}echo ${GIT_VERSION}.${GIT_EXTRA_VERSION} >"${GIT_SOURCE_DIR}"/version
else
@@ -555,19 +555,19 @@ ${PROTOC_GEN_GO_GRPC}:TOOL_VERSION = v${PROTOC_GEN_GO_GRPC_VERSION}
${TEST_REPO}:
${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@
- # Git notes aren't fetched by default with git clone
- ${GIT} -C $@ fetch origin refs/notes/*:refs/notes/*
- rm -rf $@/refs
- mkdir -p $@/refs/heads $@/refs/tags
- cp ${SOURCE_DIR}/_support/gitlab-test.git-packed-refs $@/packed-refs
- ${GIT} -C $@ fsck --no-progress
+ ${Q}# Git notes aren't fetched by default with git clone
+ ${GIT} -C $@ fetch ${GIT_QUIET} origin refs/notes/*:refs/notes/*
+ ${Q}rm -rf $@/refs
+ ${Q}mkdir -p $@/refs/heads $@/refs/tags
+ ${Q}cp ${SOURCE_DIR}/_support/gitlab-test.git-packed-refs $@/packed-refs
+ ${Q}${GIT} -C $@ fsck --no-progress
${TEST_REPO_GIT}:
${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-git-test.git $@
- rm -rf $@/refs
- mkdir -p $@/refs/heads $@/refs/tags
- cp ${SOURCE_DIR}/_support/gitlab-git-test.git-packed-refs $@/packed-refs
- ${GIT} -C $@ fsck --no-progress
+ ${Q}rm -rf $@/refs
+ ${Q}mkdir -p $@/refs/heads $@/refs/tags
+ ${Q}cp ${SOURCE_DIR}/_support/gitlab-git-test.git-packed-refs $@/packed-refs
+ ${Q}${GIT} -C $@ fsck --no-progress
${BENCHMARK_REPO}:
${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab.git $@