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>2022-10-06 13:44:57 +0300
committerPatrick Steinhardt <psteinhardt@gitlab.com>2022-10-10 17:04:53 +0300
commit8751343f230ee12a009546c8e6e5ad7c3c09db61 (patch)
tree6242ccebd88c58087ca16915cf2fbb7c64dd1c03
parent625ad956b9d046d984090c7137a535307bf54a87 (diff)
Makefile: Group together recipes to build our tools
Reorder the recipes so that our tools-related ones are grouped together.
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 600e3193f..adf7e3a01 100644
--- a/Makefile
+++ b/Makefile
@@ -694,9 +694,6 @@ ${PROTOC}: ${DEPENDENCY_DIR}/protoc.version | ${TOOLS_DIR}
${Q}cmake --build "${PROTOC_BUILD_DIR}" --target install -- -j $(shell nproc)
${Q}cp "${PROTOC_INSTALL_DIR}"/bin/protoc ${PROTOC}
-${TOOLS_DIR}/%: ${TOOLS_DIR}/%.version
- ${Q}GOBIN=${TOOLS_DIR} go install ${TOOL_PACKAGE}@${TOOL_VERSION}
-
${PROTOC_GEN_GITALY_LINT}: proto | ${TOOLS_DIR}
${Q}go build -o $@ ${SOURCE_DIR}/tools/protoc-gen-gitaly-lint
@@ -704,6 +701,9 @@ ${PROTOC_GEN_GITALY_PROTOLIST}: | ${TOOLS_DIR}
${Q}go build -o $@ ${SOURCE_DIR}/tools/protoc-gen-gitaly-protolist
# External tools
+${TOOLS_DIR}/%: ${TOOLS_DIR}/%.version
+ ${Q}GOBIN=${TOOLS_DIR} go install ${TOOL_PACKAGE}@${TOOL_VERSION}
+
${GOCOVER_COBERTURA}: TOOL_PACKAGE = github.com/t-yuki/gocover-cobertura
${GOCOVER_COBERTURA}: TOOL_VERSION = ${GOCOVER_COBERTURA_VERSION}
${GOFUMPT}: TOOL_PACKAGE = mvdan.cc/gofumpt