Skip to content

Commit 03b3134

Browse files
committed
chore: update linter, and workflow
1 parent 4d9d983 commit 03b3134

File tree

3 files changed

+38
-59
lines changed

3 files changed

+38
-59
lines changed

Diff for: .github/workflows/ci.yml

+4-11
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- main
78
pull_request:
89

910
jobs:
@@ -13,24 +14,16 @@ jobs:
1314
runs-on: ubuntu-latest
1415
env:
1516
GO_VERSION: stable
16-
GOLANGCI_LINT_VERSION: v1.56.2
17+
GOLANGCI_LINT_VERSION: v1.63.4
1718
CGO_ENABLED: 0
1819

1920
steps:
2021

21-
# https://github.com/marketplace/actions/checkout
22-
- name: Check out code
23-
uses: actions/checkout@v4
24-
with:
25-
fetch-depth: 0
26-
27-
# https://github.com/marketplace/actions/setup-go-environment
28-
- name: Set up Go ${{ env.GO_VERSION }}
29-
uses: actions/setup-go@v5
22+
- uses: actions/checkout@v4
23+
- uses: actions/setup-go@v5
3024
with:
3125
go-version: ${{ env.GO_VERSION }}
3226

33-
3427
- name: Check and get dependencies
3528
run: |
3629
go mod tidy

Diff for: .github/workflows/go-cross.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- master
7+
- main
78
pull_request:
89

910
jobs:
@@ -20,14 +21,8 @@ jobs:
2021
os: [ubuntu-latest, macos-latest, windows-latest]
2122

2223
steps:
23-
24-
# https://github.com/marketplace/actions/checkout
25-
- name: Checkout code
26-
uses: actions/checkout@v4
27-
28-
# https://github.com/marketplace/actions/setup-go-environment
29-
- name: Set up Go ${{ matrix.go-version }}
30-
uses: actions/setup-go@v5
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-go@v5
3126
with:
3227
go-version: ${{ matrix.go-version }}
3328

Diff for: .golangci.yml

+31-40
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,28 @@
1-
run:
2-
timeout: 2m
1+
linters:
2+
enable-all: true
3+
disable:
4+
- exportloopref # deprecated
5+
- cyclop # duplicate of gocyclo
6+
- sqlclosecheck # not relevant (SQL)
7+
- rowserrcheck # not relevant (SQL)
8+
- dupl
9+
- lll
10+
- nestif
11+
- mnd
12+
- err113
13+
- nlreturn
14+
- wsl
15+
- exhaustive
16+
- exhaustruct
17+
- tparallel
18+
- testpackage
19+
- paralleltest
20+
- forcetypeassert
21+
- varnamelen
22+
- prealloc # false-positives
23+
- nonamedreturns
24+
- nilerr
25+
- depguard
326

427
linters-settings:
528
govet:
@@ -23,44 +46,9 @@ linters-settings:
2346
godox:
2447
keywords:
2548
- FIXME
26-
27-
linters:
28-
enable-all: true
29-
disable:
30-
- deadcode # deprecated
31-
- exhaustivestruct # deprecated
32-
- golint # deprecated
33-
- ifshort # deprecated
34-
- interfacer # deprecated
35-
- maligned # deprecated
36-
- nosnakecase # deprecated
37-
- scopelint # deprecated
38-
- structcheck # deprecated
39-
- varcheck # deprecated
40-
- cyclop # duplicate of gocyclo
41-
- sqlclosecheck # not relevant (SQL)
42-
- rowserrcheck # not relevant (SQL)
43-
- execinquery # not relevant (SQL)
44-
- dupl
45-
- lll
46-
- nestif
47-
- gomnd
48-
- goerr113
49-
- nlreturn
50-
- wsl
51-
- exhaustive
52-
- exhaustruct
53-
- tparallel
54-
- testpackage
55-
- paralleltest
56-
- ifshort
57-
- forcetypeassert
58-
- varnamelen
59-
- prealloc # false-positives
60-
- nosnakecase
61-
- nonamedreturns
62-
- nilerr
63-
- depguard
49+
gosec:
50+
excludes:
51+
- G115 # integer overflow conversion
6452

6553
issues:
6654
exclude-use-default: false
@@ -78,3 +66,6 @@ issues:
7866
- path: cmd/revgrep/main.go
7967
linters:
8068
- forbidigo
69+
70+
run:
71+
timeout: 2m

0 commit comments

Comments
 (0)