Skip to content
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.

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

Update to Go 1.18 and update GolangCI Linter #672

Merged
merged 16 commits into from
Apr 16, 2022
Merged
Show file tree
Hide file tree
Changes from 9 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
2 changes: 1 addition & 1 deletion .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.18

- name: Check out code
uses: actions/checkout@v2
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,13 @@ jobs:
- name: Check out code
uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.18

- name: Run golangci-lint
uses: golangci/golangci-lint-action@v2
uses: golangci/golangci-lint-action@v3
with:
version: v1.29
version: v1.45.2
working-directory: v3
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.18

- name: Check out code
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.18

- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tld-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: ^1.16
go-version: ^1.18

- name: Set current date
id: get-date
Expand Down
1 change: 1 addition & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ linters:
- goconst
- golint
- godot
- forbidigo
Copy link
Member Author

@christopher-henderson christopher-henderson Apr 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

forbidgo is profoundly useless. It literally bans certain regexes from your codebase - notable any use of fmt.Print(f|ln) (because I guess it's illegal to print to stdout without a logging framework?)


issues:
exclude-rules:
Expand Down
18 changes: 18 additions & 0 deletions v3/cmd/genTestCerts/go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module github.com/zmap/zlint/v3/cmd/genTestCerts

go 1.18

require (
github.com/zmap/zcrypto v0.0.0-20210811211718-6f9bc4aff20f
github.com/zmap/zlint/v3 v3.0.0
)

require (
github.com/weppos/publicsuffix-go v0.15.1-0.20210807195340-dc689ff0bb59 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
golang.org/x/text v0.3.5 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
)

replace github.com/zmap/zlint/v3 => ../../
14 changes: 9 additions & 5 deletions v3/go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,20 @@
module github.com/zmap/zlint/v3

require (
github.com/kr/text v0.2.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0 // indirect
github.com/zmap/zcrypto v0.0.0-20210811211718-6f9bc4aff20f
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 // indirect
golang.org/x/text v0.3.5
)

require (
github.com/kr/text v0.2.0 // indirect
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
github.com/stretchr/testify v1.7.0 // indirect
github.com/weppos/publicsuffix-go v0.15.1-0.20210807195340-dc689ff0bb59 // indirect
golang.org/x/sys v0.0.0-20210228012217-479acdf4ea46 // indirect
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
)

go 1.16
go 1.18