Skip to content

Commit 3638d46

Browse files
authored
Merge branch 'main' into dependabot/go_modules/github.com/stretchr/testify-1.10.0
2 parents f8e3e75 + f5bc6eb commit 3638d46

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ jobs:
2929
- name: Run golangci-lint
3030
uses: golangci/golangci-lint-action@v6.1.1
3131
with:
32-
version: v1.55.2
32+
version: v1.62.2
3333
skip-cache: true

.golangci.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,24 @@
1+
issues:
2+
exclude-case-sensitive: false
3+
exclude-dirs-use-default: true
4+
exclude-files:
5+
- .*_mock\.go
6+
- mock_.*\.go
7+
- .*/pkg/mod/.*$
8+
- .*/go/src/.*\.go
9+
exclude-generated: strict
10+
exclude-use-default: true
11+
max-issues-per-linter: 50
112
linters:
213
disable-all: true
314
enable:
415
- errcheck
5-
- gas
616
- goconst
717
- gocyclo
818
- gofmt
919
- revive
1020
- govet
1121
- ineffassign
12-
- megacheck
1322
- misspell
1423
- typecheck
1524
- unconvert
@@ -22,7 +31,6 @@ linters:
2231
- durationcheck
2332
- errorlint
2433
- exhaustive
25-
- exportloopref
2634
- forbidigo
2735
- forcetypeassert
2836
- gocritic
@@ -60,9 +68,8 @@ linters-settings:
6068
goimports:
6169
local-prefixes: go.opentelemetry.io
6270
govet:
63-
check-shadowing: false
64-
maligned:
65-
suggest-new: true
71+
disable:
72+
- shadow
6673
misspell:
6774
ignore-words:
6875
- cancelled
@@ -71,15 +78,12 @@ linters-settings:
7178
ignore-generated-header: true
7279
severity: warning
7380
output:
74-
format: colored-line-number
81+
formats:
82+
- format: colored-line-number
7583
print-issued-lines: true
7684
print-linter-name: true
7785
run:
7886
concurrency: 4
7987
issues-exit-code: 1
80-
skip-files:
81-
- .*_mock\.go
82-
- mock_.*\.go
83-
- .*/pkg/mod/.*$
8488
tests: false
8589
timeout: 1m

0 commit comments

Comments
 (0)