luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Pin lint-consul-retry to v1.3.0 (#19777) 

The latest version finds more issues which are fixed on main and not being backported.
This commit is contained in:
Matt Keeler 2023-11-29 16:37:51 -05:00 committed by GitHub
parent 5507e9d798
commit 8b3f1dcbdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 144 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.github/workflows/go-tests.yml vendored
View File

@ -4,12 +4,12 @@ on:
pull_request: pull_request:
branches-ignore: branches-ignore:
- stable-website - stable-website
- 'docs/**' - "docs/**"
- 'ui/**' - "ui/**"
- 'mktg-**' # Digital Team Terraform-generated branches' prefix - "mktg-**" # Digital Team Terraform-generated branches' prefix
- 'backport/docs/**' - "backport/docs/**"
- 'backport/ui/**' - "backport/ui/**"
- 'backport/mktg-**' - "backport/mktg-**"
push: push:
branches: branches:
# Push events on the main branch # Push events on the main branch
@ -81,7 +81,7 @@ jobs:
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com" run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with: with:
go-version-file: 'go.mod' go-version-file: "go.mod"
- run: make proto-tools - run: make proto-tools
name: Install protobuf name: Install protobuf
- run: make proto-format - run: make proto-format
@ -109,7 +109,7 @@ jobs:
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com" run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with: with:
go-version-file: 'go.mod' go-version-file: "go.mod"
- run: make --always-make deep-copy - run: make --always-make deep-copy
- run: | - run: |
if ! git diff --exit-code; then if ! git diff --exit-code; then
@ -132,7 +132,7 @@ jobs:
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com" run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with: with:
go-version-file: 'go.mod' go-version-file: "go.mod"
- run: go install github.com/reillywatson/enumcover/cmd/enumcover@master && enumcover ./... - run: go install github.com/reillywatson/enumcover/cmd/enumcover@master && enumcover ./...
- name: Notify Slack - name: Notify Slack
if: ${{ failure() }} if: ${{ failure() }}
@ -149,7 +149,7 @@ jobs:
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com" run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with: with:
go-version-file: 'go.mod' go-version-file: "go.mod"
- run: make lint-container-test-deps - run: make lint-container-test-deps
- name: Notify Slack - name: Notify Slack
if: ${{ failure() }} if: ${{ failure() }}
@ -167,8 +167,8 @@ jobs:
run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com" run: git config --global url."https://${{ secrets.ELEVATED_GITHUB_TOKEN }}:@github.com".insteadOf "https://github.com"
- uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1 - uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
with: with:
go-version-file: 'go.mod' 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
- name: Notify Slack - name: Notify Slack
if: ${{ failure() }} if: ${{ failure() }}
run: .github/scripts/notify_slack.sh run: .github/scripts/notify_slack.sh

1
GNUmakefile
View File

@ -18,6 +18,7 @@ MOG_VERSION='v0.4.0'
PROTOC_GO_INJECT_TAG_VERSION='v1.3.0' PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
PROTOC_GEN_GO_BINARY_VERSION="v0.1.0" PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2' DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
LINT_CONSUL_RETRY_VERSION='v1.3.0'
MOCKED_PB_DIRS= pbdns MOCKED_PB_DIRS= pbdns

8
build-support/scripts/devtools.sh
View File

@ -130,12 +130,16 @@ function proto_tools_install {
} }
function lint_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 local golangci_lint_version
golangci_lint_version="$(make --no-print-directory print-GOLANGCI_LINT_VERSION)" golangci_lint_version="$(make --no-print-directory print-GOLANGCI_LINT_VERSION)"
install_unversioned_tool \ install_versioned_tool \
'lint-consul-retry' \ '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 \ install_unversioned_tool \
'enumcover' \ 'enumcover' \