Skip to content

Fix CI #4

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
merged 4 commits into from
May 30, 2025
Merged

Fix CI #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
adf50c9
Upgrade go + staticcheck
alexhulbert May 23, 2025
2725be8
Fix lint issues caused by go upgrade
alexhulbert May 23, 2025
d5a26b1
Upgrade golangci
alexhulbert May 23, 2025
783ad2f
Remove deprecated golangci lint rules
alexhulbert May 24, 2025
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
8 changes: 4 additions & 4 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ^1.21
go-version: ^1.24
id: go

- name: Check out code into the Go module directory
Expand All @@ -30,7 +30,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v3
with:
go-version: ^1.21
go-version: ^1.24
id: go

- name: Check out code into the Go module directory
Expand All @@ -40,10 +40,10 @@ jobs:
run: go install mvdan.cc/gofumpt@v0.4.0

- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@v0.4.2
run: go install honnef.co/go/tools/cmd/staticcheck@v0.6.1

- name: Install golangci-lint
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.0
run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.8

- name: Install NilAway
run: go install go.uber.org/nilaway/cmd/nilaway@latest
Expand Down
17 changes: 2 additions & 15 deletions .golangci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,21 @@ linters:
- gocritic
- godot
- godox
- gomnd
- lll
- mnd
- nestif
- nilnil
- nlreturn
- noctx
- nonamedreturns
- nosnakecase
- paralleltest
- revive
- testpackage
- tenv
- unparam
- varnamelen
- wrapcheck
- wsl
- deadcode
- varcheck
- exhaustruct
- depguard

Expand All @@ -36,19 +34,8 @@ linters:
- contextcheck
- rowserrcheck
- sqlclosecheck
- structcheck
- wastedassign

#
# Disabled because deprecated:
#
- exhaustivestruct
- golint
- ifshort
- interfacer
- maligned
- scopelint

linters-settings:
#
# The G108 rule throws a false positive. We're not actually vulnerable. If
Expand Down
2 changes: 1 addition & 1 deletion cmd/httpserver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/flashbots/ssh-pubkey-server/common"
"github.com/flashbots/ssh-pubkey-server/httpserver"
"github.com/google/uuid"
"github.com/urfave/cli/v2" // imports as package "cli"
cli "github.com/urfave/cli/v2"
)

var flags []cli.Flag = []cli.Flag{
Expand Down
2 changes: 1 addition & 1 deletion httpserver/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/flashbots/go-utils/httplogger"
"github.com/flashbots/ssh-pubkey-server/common"
"github.com/flashbots/ssh-pubkey-server/metrics"
"github.com/go-chi/chi/v5"
chi "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware"
"go.uber.org/atomic"
)
Expand Down