diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-03-05 12:52:11 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-03-09 10:56:30 +0300 |
| commit | fcffd63f502bbfdf29f29f16f73da292e75c8fef (patch) | |
| tree | 957360caa09d5d5295c4b737206630cc84245093 /Makefile | |
| parent | 4effb0e78405326a7b35c7bf4a2d80b4ce3593d5 (diff) | |
Makefile: Split package path and version into separate vars
In order to be able to get rid of the Makefile.sha256 hack in favor of
more specialized per-tool version files, we need to separate the package
path from the desired package version. Let's do so and split these up.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -477,7 +477,7 @@ ${TOOLS_DIR}/%/go.mod: | ${TOOLS_DIR} ${TOOLS_DIR}/%: GOBIN = ${TOOLS_DIR} ${TOOLS_DIR}/%: ${BUILD_DIR}/Makefile.sha256 ${TOOLS_DIR}/.%/go.mod - ${Q}cd ${TOOLS_DIR}/.$(notdir $@) && go get ${TOOL_PACKAGE} + ${Q}cd ${TOOLS_DIR}/.$(notdir $@) && go get ${TOOL_PACKAGE}@${TOOL_VERSION} # Tools hosted by Gitaly itself ${GITALYFMT}: | ${TOOLS_DIR} @@ -487,12 +487,18 @@ ${PROTOC_GEN_GITALY}: proto | ${TOOLS_DIR} ${Q}go build -o $@ ${SOURCE_DIR}/proto/go/internal/cmd/protoc-gen-gitaly # External tools -${GOCOVER_COBERTURA}: TOOL_PACKAGE = github.com/t-yuki/gocover-cobertura@${GOCOVER_COBERTURA_VERSION} -${GOIMPORTS}: TOOL_PACKAGE = golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION} -${GOLANGCI_LINT}: TOOL_PACKAGE = github.com/golangci/golangci-lint/cmd/golangci-lint@v${GOLANGCI_LINT_VERSION} -${GO_JUNIT_REPORT}: TOOL_PACKAGE = github.com/jstemmer/go-junit-report@${GO_JUNIT_REPORT_VERSION} -${GO_LICENSES}: TOOL_PACKAGE = github.com/google/go-licenses@${GO_LICENSES_VERSION} -${PROTOC_GEN_GO}: TOOL_PACKAGE = github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} +${GOCOVER_COBERTURA}: TOOL_PACKAGE = github.com/t-yuki/gocover-cobertura +${GOCOVER_COBERTURA}: TOOL_VERSION = ${GOCOVER_COBERTURA_VERSION} +${GOIMPORTS}: TOOL_PACKAGE = golang.org/x/tools/cmd/goimports +${GOIMPORTS}: TOOL_VERSION = ${GOIMPORTS_VERSION} +${GOLANGCI_LINT}: TOOL_PACKAGE = github.com/golangci/golangci-lint/cmd/golangci-lint +${GOLANGCI_LINT}: TOOL_VERSION = v${GOLANGCI_LINT_VERSION} +${GO_JUNIT_REPORT}: TOOL_PACKAGE = github.com/jstemmer/go-junit-report +${GO_JUNIT_REPORT}: TOOL_VERSION = ${GO_JUNIT_REPORT_VERSION} +${GO_LICENSES}: TOOL_PACKAGE = github.com/google/go-licenses +${GO_LICENSES}: TOOL_VERSION = ${GO_LICENSES_VERSION} +${PROTOC_GEN_GO}: TOOL_PACKAGE = github.com/golang/protobuf/protoc-gen-go +${PROTOC_GEN_GO}: TOOL_VERSION = v${PROTOC_GEN_GO_VERSION} ${TEST_REPO}: ${GIT} clone --bare ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@ |