From 8f7f15e43008eeb5340ada8831f00ed651b847b0 Mon Sep 17 00:00:00 2001 From: Matt Keeler Date: Wed, 29 Nov 2023 17:44:22 -0500 Subject: [PATCH] Pin lint-consul-retry to v1.3.0 (#19781) Co-authored-by: R.B. Boyer <4903+rboyer@users.noreply.github.com> --- .github/workflows/go-tests.yml | 2 +- Makefile | 1 + build-support/scripts/devtools.sh | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml index 0a9cafcd98..5421c4a8d0 100644 --- a/.github/workflows/go-tests.yml +++ b/.github/workflows/go-tests.yml @@ -156,7 +156,7 @@ jobs: - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 with: go-version-file: 'go.mod' - - run: go install github.com/hashicorp/lint-consul-retry@master && lint-consul-retry + - run: go install github.com/hashicorp/lint-consul-retry@v1.3.0 && lint-consul-retry lint: needs: diff --git a/Makefile b/Makefile index 7c3a76f755..34aeeba1d8 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,7 @@ PROTOC_GO_INJECT_TAG_VERSION='v1.3.0' PROTOC_GEN_GO_BINARY_VERSION='v0.1.0' DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2' COPYWRITE_TOOL_VERSION='v0.16.4' +LINT_CONSUL_RETRY_VERSION='v1.3.0' # Go imports formatter GCI_VERSION='v0.11.2' diff --git a/build-support/scripts/devtools.sh b/build-support/scripts/devtools.sh index 15e9401d7f..c9a887c0ec 100755 --- a/build-support/scripts/devtools.sh +++ b/build-support/scripts/devtools.sh @@ -141,15 +141,20 @@ function proto_tools_install { } function lint_install { + local lint_consul_retry_version + lint_consul_retry_version="$(make --no-print-directory print-LINT_CONSUL_RETRY_VERSION)" + local golangci_lint_version golangci_lint_version="$(make --no-print-directory print-GOLANGCI_LINT_VERSION)" local gci_version gci_version="$(make --no-print-directory print-GCI_VERSION)" - install_unversioned_tool \ + install_versioned_tool \ 'lint-consul-retry' \ - 'github.com/hashicorp/lint-consul-retry@master' + 'github.com/hashicorp/lint-consul-retry' \ + "${lint_consul_retry_version}" \ + 'github.com/hashicorp/lint-consul-retry' install_unversioned_tool \ 'enumcover' \