Skip to content

Commit 672ef17

Browse files
authored
Merge pull request #466 from Doozers/fix/isma/fix-lint
chore: fix golangci-lint on CI
2 parents 7392621 + 35b76f9 commit 672ef17

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v2
2222
- name: lint
23-
uses: golangci/golangci-lint-action@v2.5.2
23+
uses: golangci/golangci-lint-action@v3
2424
with:
25-
version: v1.38
25+
version: v1.50.1
2626
github-token: ${{ secrets.GITHUB_TOKEN }}
2727
tests-on-windows:
2828
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ linters:
4747
- staticcheck
4848
- structcheck
4949
#- stylecheck
50-
- typecheck
50+
#- typecheck
5151
- unconvert
5252
- unparam
5353
- unused

server.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ import (
1414
"gorm.io/gorm"
1515
"gorm.io/gorm/logger"
1616

17+
"moul.io/sshportal/pkg/bastion"
18+
1719
"github.com/gliderlabs/ssh"
1820
"github.com/urfave/cli"
1921
gossh "golang.org/x/crypto/ssh"
20-
"moul.io/sshportal/pkg/bastion"
2122
)
2223

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

86-
db, err := dbConnect(c, &gorm.Config{
87+
db, _ := dbConnect(c, &gorm.Config{
8788
Logger: logger.Default.LogMode(logger.Silent),
8889
})
8990
sqlDB, err := db.DB()

0 commit comments

Comments
 (0)