Skip to content

chore: use Go 1.24 tool for staticcheck and goimports #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blgm merged 1 commit into from
Feb 13, 2025
Merged

chore: use Go 1.24 tool for staticcheck and goimports #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ checkformat: ## Checks that the code is formatted correctly
fi

checkimports: ## Checks that imports are formatted correctly
@@if [ -n "$$(go run golang.org/x/tools/cmd/goimports -l -d .)" ]; then \
@@if [ -n "$$(go tool goimports -l -d .)" ]; then \
echo "goimports check failed: run 'make format'"; \
exit 1; \
fi
Expand All @@ -116,14 +116,14 @@ vet: ## Runs go vet
go vet ./...

staticcheck: ## Runs staticcheck
go list ./... | grep -v 'fakes$$' | xargs go run honnef.co/go/tools/cmd/staticcheck
go list ./... | grep -v 'fakes$$' | xargs go tool staticcheck

###### Format #################################################################

.PHONY: format
format: ## format the source
gofmt -s -e -l -w .
go run golang.org/x/tools/cmd/goimports -l -w .
go tool goimports -l -w .

###### Image ##################################################################

Expand Down
10 changes: 7 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ require (
github.com/zclconf/go-cty v1.16.2
golang.org/x/crypto v0.33.0
golang.org/x/net v0.35.0
golang.org/x/tools v0.30.0
gopkg.in/yaml.v3 v3.0.1
gorm.io/driver/mysql v1.5.7
gorm.io/driver/sqlite v1.5.7
gorm.io/gorm v1.25.12
honnef.co/go/tools v0.6.0
)

require (
Expand Down Expand Up @@ -132,6 +130,7 @@ require (
golang.org/x/sys v0.30.0 // indirect
golang.org/x/text v0.22.0 // indirect
golang.org/x/time v0.9.0 // indirect
golang.org/x/tools v0.30.0 // indirect
google.golang.org/api v0.219.0 // indirect
google.golang.org/genproto v0.0.0-20250127172529-29210b9bc287 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
Expand All @@ -140,7 +139,12 @@ require (
google.golang.org/protobuf v1.36.4 // indirect
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
honnef.co/go/tools v0.6.0 // indirect
rsc.io/goversion v1.2.0 // indirect
)

tool github.com/onsi/ginkgo/v2/ginkgo
tool (
github.com/onsi/ginkgo/v2/ginkgo
golang.org/x/tools/cmd/goimports
honnef.co/go/tools/cmd/staticcheck
)
2 changes: 0 additions & 2 deletions tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ package tools
import (
_ "github.com/google/gops"
_ "github.com/maxbrunsfeld/counterfeiter/v6"
_ "golang.org/x/tools/cmd/goimports"
_ "honnef.co/go/tools/cmd/staticcheck"
)

// This file imports packages that are used when running go generate, or used
Expand Down
Loading