Skip to content

Commit efa9b4b

Browse files
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](golangci/golangci-lint-action@051d919...2226d7c) 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](nick-fields/retry@7152eba...c97818c) --- 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>
1 parent 95a1fc1 commit efa9b4b

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
with:
1818
go-version-file: go.mod
1919
- name: golangci-lint
20-
uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2
20+
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2121
with:
2222
version: v1.61.0
2323
args: --timeout=8m

.github/workflows/test_crdb.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
check-latest: true
2626
cache: true
2727

28-
- uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2
28+
- uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2929
with:
3030
version: 'v1.61.0'
3131
args: ./storage/crdb
@@ -62,7 +62,7 @@ jobs:
6262
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
6363

6464
- name: Wait for CockroachDB
65-
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
65+
uses: nick-fields/retry@c97818ca39074beaea45180dba704f92496a0082 # v3.0.1
6666
with:
6767
timeout_seconds: 15
6868
max_attempts: 3

.github/workflows/test_pgdb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
check-latest: true
2626
cache: true
2727

28-
- uses: golangci/golangci-lint-action@051d91933864810ecd5e2ea2cfd98f6a5bca5347 # v6.3.2
28+
- uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2929
with:
3030
version: 'v1.61.0'
3131
args: ./storage/postgresql

.golangci.yaml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
run:
22
# timeout for analysis, e.g. 30s, 5m, default is 1m
3-
deadline: 90s
4-
skip-files:
5-
- types/internal/tls/tls.go
3+
timeout: 90s
64

75
linters-settings:
86
gocyclo:
97
# minimal code complexity to report, 30 by default (but we recommend 10-20)
108
# TODO(mhutchinson): lower this again after reworking interceptor
119
min-complexity: 26
1210
depguard:
13-
list-type: blacklist
14-
packages:
15-
- golang.org/x/net/context
16-
- github.com/gogo/protobuf/proto
11+
rules:
12+
main:
13+
deny:
14+
- pkg: "golang.org/x/net/context"
15+
- pkg: "github.com/gogo/protobuf/proto"
1716

1817
issues:
1918
# Don't turn off any checks by default. We can do this explicitly if needed.
@@ -27,3 +26,6 @@ issues:
2726
text: 'SA1019: grpc.DialContext is deprecated: use NewClient instead'
2827
- linters: [staticcheck]
2928
text: 'SA1019: grpc.WithBlock is deprecated: this DialOption is not supported by NewClient'
29+
30+
exclude-files:
31+
- types/internal/tls/tls.go

0 commit comments

Comments
 (0)