Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
path: src/github.com/goccmack/gocc

- name: golangci-lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
version: v1.60
version: v2.1.2
args: --issues-exit-code=0 # Do not care about output, we run golangci-lint in the Makefile again and then we do care.
working-directory: ${{env.working-directory}}
install-mode: "goinstall" # This is slow, but necessary if you are using a newer version of Go than golangci-lint supports
Expand Down
30 changes: 23 additions & 7 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,36 @@
run:
timeout: 60s
version: "2"
linters:
enable:
- dogsled
- dupl
- errcheck
- gocyclo
- gofmt
- goimports
- misspell
- prealloc
- unconvert
- whitespace
disable:
- unused
- depguard
- govet
- staticcheck

- unused
exclusions:
generated: lax
presets:
- comments
- common-false-positives
- legacy
- std-error-handling
paths:
- third_party$
- builtin$
- examples$
formatters:
enable:
- gofmt
- goimports
exclusions:
generated: lax
paths:
- third_party$
- builtin$
- examples$
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ci-lint: ## see https://golangci-lint.run/, applies .golangci.yml

lint:
make govet
## make ci-lint ## Temporarily disabled for go 1.24 until golangci-lint supports go 1.24
make ci-lint

goclean: gofmt ## apply go style rules to source

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/goccmack/gocc

go 1.24

require golang.org/x/mod v0.8.0
require golang.org/x/mod v0.24.0
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
Loading