diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-09 16:43:29 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-06-09 17:15:36 +0300 |
| commit | 1477d1380a3c39f2f1f609fc78df88c04a70df47 (patch) | |
| tree | d8a47962941d8e47ad7ca66af304120555156967 | |
| parent | c432c3573b9a12b38deba04a9ad242b15a63600e (diff) | |
Makefile: Consistently require `v` prefix for tool versionspks-makefile-tooling-version-bumps
While some of our tool versions require the `v` prefix of their tag to
be present, others don't. This is inconsistent and a tag confusing.
Unify this to always require the prefix. This also gives us more
flexbiility given that it's now easily possible to e.g. override the
version with a commit ID.
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -86,19 +86,19 @@ ifeq (${FIPS_MODE}, 1) endif # Dependency versions -GOLANGCI_LINT_VERSION ?= 1.46.1 -PROTOLINT_VERSION ?= 0.38.1 +GOLANGCI_LINT_VERSION ?= v1.46.1 +PROTOLINT_VERSION ?= v0.38.1 GOCOVER_COBERTURA_VERSION ?= aaee18c8195c3f2d90e5ef80ca918d265463842a -GOFUMPT_VERSION ?= 0.3.1 +GOFUMPT_VERSION ?= v0.3.1 GOIMPORTS_VERSION ?= v0.1.10 GOTESTSUM_VERSION ?= v1.8.1 GO_LICENSES_VERSION ?= v1.2.1 # https://pkg.go.dev/github.com/protocolbuffers/protobuf PROTOC_VERSION ?= v21.1 # https://pkg.go.dev/google.golang.org/protobuf -PROTOC_GEN_GO_VERSION ?= 1.28.0 +PROTOC_GEN_GO_VERSION ?= v1.28.0 # https://pkg.go.dev/google.golang.org/grpc/cmd/protoc-gen-go-grpc -PROTOC_GEN_GO_GRPC_VERSION?= 1.2.0 +PROTOC_GEN_GO_GRPC_VERSION?= v1.2.0 # Git2Go and libgit2 may need to be updated in sync. Please refer to # https://github.com/libgit2/git2go/#which-go-version-to-use for a # compatibility matrix. @@ -654,21 +654,21 @@ ${PROTOC_GEN_GITALY_PROTOLIST}: | ${TOOLS_DIR} ${GOCOVER_COBERTURA}: TOOL_PACKAGE = github.com/t-yuki/gocover-cobertura ${GOCOVER_COBERTURA}: TOOL_VERSION = ${GOCOVER_COBERTURA_VERSION} ${GOFUMPT}: TOOL_PACKAGE = mvdan.cc/gofumpt -${GOFUMPT}: TOOL_VERSION = v${GOFUMPT_VERSION} +${GOFUMPT}: TOOL_VERSION = ${GOFUMPT_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} +${GOLANGCI_LINT}: TOOL_VERSION = ${GOLANGCI_LINT_VERSION} ${PROTOLINT}: TOOL_PACKAGE = github.com/yoheimuta/protolint/cmd/protolint -${PROTOLINT}: TOOL_VERSION = v${PROTOLINT_VERSION} +${PROTOLINT}: TOOL_VERSION = ${PROTOLINT_VERSION} ${GOTESTSUM}: TOOL_PACKAGE = gotest.tools/gotestsum ${GOTESTSUM}: TOOL_VERSION = ${GOTESTSUM_VERSION} ${GO_LICENSES}: TOOL_PACKAGE = github.com/google/go-licenses ${GO_LICENSES}: TOOL_VERSION = ${GO_LICENSES_VERSION} ${PROTOC_GEN_GO}: TOOL_PACKAGE = google.golang.org/protobuf/cmd/protoc-gen-go -${PROTOC_GEN_GO}: TOOL_VERSION = v${PROTOC_GEN_GO_VERSION} +${PROTOC_GEN_GO}: TOOL_VERSION = ${PROTOC_GEN_GO_VERSION} ${PROTOC_GEN_GO_GRPC}:TOOL_PACKAGE = google.golang.org/grpc/cmd/protoc-gen-go-grpc -${PROTOC_GEN_GO_GRPC}:TOOL_VERSION = v${PROTOC_GEN_GO_GRPC_VERSION} +${PROTOC_GEN_GO_GRPC}:TOOL_VERSION = ${PROTOC_GEN_GO_GRPC_VERSION} ${TEST_REPO_MIRROR}: ${GIT} clone --mirror ${GIT_QUIET} https://gitlab.com/gitlab-org/gitlab-test.git $@ |