Skip to content

Commit

Permalink
Merge pull request #466 from Doozers/fix/isma/fix-lint
Browse files Browse the repository at this point in the history
chore: fix golangci-lint on CI
  • Loading branch information
moul authored May 19, 2023
2 parents 7392621 + 35b76f9 commit 672ef17
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: lint
uses: golangci/golangci-lint-action@v2.5.2
uses: golangci/golangci-lint-action@v3
with:
version: v1.38
version: v1.50.1
github-token: ${{ secrets.GITHUB_TOKEN }}
tests-on-windows:
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ linters:
- staticcheck
- structcheck
#- stylecheck
- typecheck
#- typecheck
- unconvert
- unparam
- unused
Expand Down
5 changes: 3 additions & 2 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ import (
"gorm.io/gorm"
"gorm.io/gorm/logger"

"moul.io/sshportal/pkg/bastion"

"github.com/gliderlabs/ssh"
"github.com/urfave/cli"
gossh "golang.org/x/crypto/ssh"
"moul.io/sshportal/pkg/bastion"
)

type serverConfig struct {
Expand Down Expand Up @@ -83,7 +84,7 @@ func dbConnect(c *serverConfig, config gorm.Option) (*gorm.DB, error) {
func server(c *serverConfig) (err error) {
// configure db logging

db, err := dbConnect(c, &gorm.Config{
db, _ := dbConnect(c, &gorm.Config{
Logger: logger.Default.LogMode(logger.Silent),
})
sqlDB, err := db.DB()
Expand Down

0 comments on commit 672ef17

Please sign in to comment.