diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-06-22 10:25:50 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-06-22 10:26:07 +0300 |
| commit | e9c29d59d268d768e1e55a54126b215164f9bf81 (patch) | |
| tree | 8b0aaa95f180d864f879cf5c8b9e7e3a438bb3f9 | |
| parent | debe076efb18bd68517fd1514dbe0ed1e3734e1d (diff) | |
Makefile: Make protoc-gen-go version configurable
In contrast to all the other dependencies, the version of protoc-gen-go
cannot be overridden currently as it is inlined into the call to go-get.
Fix this by using a separate variable to store the version.
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -44,6 +44,7 @@ GO_BUILD_TAGS := tracer_static tracer_static_jaeger continuous_profiler_stackd # Dependency versions GOLANGCI_LINT_VERSION ?= 1.24.0 PROTOC_VERSION ?= 3.6.1 +PROTOC_GEN_GO_VERSION ?= 1.3.2 GIT_VERSION ?= v2.27.0 # Dependency downloads @@ -362,7 +363,7 @@ ${GO_LICENSES}: ${BUILD_DIR}/go.mod | ${BUILD_DIR}/bin cd ${BUILD_DIR} && go get github.com/google/go-licenses@0fa8c766a59182ce9fd94169ddb52abe568b7f4e ${PROTOC_GEN_GO}: ${BUILD_DIR}/go.mod | ${BUILD_DIR}/bin - cd ${BUILD_DIR} && go get github.com/golang/protobuf/protoc-gen-go@v1.3.2 + cd ${BUILD_DIR} && go get github.com/golang/protobuf/protoc-gen-go@v${PROTOC_GEN_GO_VERSION} ${PROTOC_GEN_GITALY}: ${BUILD_DIR}/go.mod proto-lint | ${BUILD_DIR}/bin go build -o $@ gitlab.com/gitlab-org/gitaly/proto/go/internal/cmd/protoc-gen-gitaly |