From fd3246aa207a9acf83176201e8917963112f587c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Feb 2025 15:55:18 +0000
Subject: [PATCH] Bump the github-actions-deps group with 2 updates (#3736)
* Bump the github-actions-deps group with 2 updates
Bumps the github-actions-deps group with 2 updates: [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) and [nick-fields/retry](https://github.com/nick-fields/retry).
Updates `golangci/golangci-lint-action` from 6.3.2 to 6.5.0
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](https://github.com/golangci/golangci-lint-action/compare/051d91933864810ecd5e2ea2cfd98f6a5bca5347...2226d7cb06a077cd73e56eedd38eecad18e5d837)
Updates `nick-fields/retry` from 3.0.0 to 3.0.1
- [Release notes](https://github.com/nick-fields/retry/releases)
- [Changelog](https://github.com/nick-fields/retry/blob/master/.releaserc.js)
- [Commits](https://github.com/nick-fields/retry/compare/7152eba30c6575329ac0576536151aca5a72780e...c97818ca39074beaea45180dba704f92496a0082)
---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: github-actions-deps
- dependency-name: nick-fields/retry
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: github-actions-deps
...
Signed-off-by: dependabot[bot] <support@github.com>
* Rename `deadline` to `timeout` and `skip-files` to `exclude-files`
* Fix deprecated `linters-settings.depguard.list-type`
---------
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Roger Ng <rogerng@google.com>
---
.github/workflows/golangci-lint.yml | 2 +-
.github/workflows/test_crdb.yaml | 4 ++--
.github/workflows/test_pgdb.yaml | 2 +-
.golangci.yaml | 16 +++++++++-------
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 49533a17e3..bddfcf8e36 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -17,7 +17,7 @@ jobs:
with:
go-version-file: go.mod
- name: golangci-lint
- uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+ uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with:
version: v1.55.1
args: --timeout=8m
diff --git a/.github/workflows/test_crdb.yaml b/.github/workflows/test_crdb.yaml
index 2a1a5beb9f..4ccece1152 100644
--- a/.github/workflows/test_crdb.yaml
+++ b/.github/workflows/test_crdb.yaml
@@ -25,7 +25,7 @@ jobs:
check-latest: true
cache: true
- - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+ - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with:
version: 'v1.55.1'
args: ./storage/crdb
@@ -62,7 +62,7 @@ jobs:
run: docker run --rm -d --name=roach -p 8080:8080 -p 26257:26257 -v "${PWD}/cockroach-data:/cockroach/cockroach-data" cockroachdb/cockroach:latest start-single-node --insecure
- name: Wait for CockroachDB
- uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
+ uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
with:
timeout_seconds: 15
max_attempts: 3
diff --git a/.github/workflows/test_pgdb.yaml b/.github/workflows/test_pgdb.yaml
index 0dd96ca4bf..5baf50e11b 100644
--- a/.github/workflows/test_pgdb.yaml
+++ b/.github/workflows/test_pgdb.yaml
@@ -25,7 +25,7 @@ jobs:
check-latest: true
cache: true
- - uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
+ - uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
with:
version: 'v1.55.1'
args: ./storage/postgresql
diff --git a/.golangci.yaml b/.golangci.yaml
index dfe48fe6e8..149dc79c33 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,8 +1,6 @@
run:
# timeout for analysis, e.g. 30s, 5m, default is 1m
- deadline: 90s
- skip-files:
- - types/internal/tls/tls.go
+ timeout: 90s
linters-settings:
gocyclo:
@@ -10,10 +8,11 @@ linters-settings:
# TODO(mhutchinson): lower this again after reworking interceptor
min-complexity: 26
depguard:
- list-type: blacklist
- packages:
- - golang.org/x/net/context
- - github.com/gogo/protobuf/proto
+ rules:
+ main:
+ deny:
+ - pkg: "golang.org/x/net/context"
+ - pkg: "github.com/gogo/protobuf/proto"
issues:
# Don't turn off any checks by default. We can do this explicitly if needed.
@@ -27,3 +26,6 @@ issues:
text: 'SA1019: grpc.DialContext is deprecated: use NewClient instead'
- linters: [staticcheck]
text: 'SA1019: grpc.WithBlock is deprecated: this DialOption is not supported by NewClient'
+
+ exclude-files:
+ - types/internal/tls/tls.go