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.

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

Update CI workflow and drop slices for compatibility #135

Merged
merged 13 commits into from
Nov 21, 2023
Merged

Update CI workflow and drop slices for compatibility #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2972025
Revert "Use slices from stdlib over golang.org/x/exp/slices (#134)"
oliversun9 Nov 21, 2023
2040ed8
ci run on all branches
oliversun9 Nov 21, 2023
a179325
branch back to main
oliversun9 Nov 21, 2023
bc258e1
use make lint-go
oliversun9 Nov 21, 2023
96868bb
add make lint-go-fix and run it
oliversun9 Nov 21, 2023
3cd8ac7
ignore gci in for result go
oliversun9 Nov 21, 2023
0b04898
import list
oliversun9 Nov 21, 2023
3614a00
go back to golangci-lint action, but with only-new-issues set to false
oliversun9 Nov 21, 2023
f9b8cc3
try skip-cache
oliversun9 Nov 21, 2023
e014d09
try go install
oliversun9 Nov 21, 2023
2580957
change other options back
oliversun9 Nov 21, 2023
4ef8ee3
remove quotes
oliversun9 Nov 21, 2023
96150b5
make lint-go
oliversun9 Nov 21, 2023
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
10 changes: 1 addition & 9 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,4 @@ jobs:
- name: Test
run: make test
- name: Lint
uses: golangci/golangci-lint-action@v3
with:
version: v1.53
skip-pkg-cache: true
only-new-issues: true
args: >
--modules-download-mode=readonly
--timeout=3m0s
./tools/...
run: make lint-go
4 changes: 4 additions & 0 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ issues:
linters:
- gosec
- forbidigo
# gci is confused by "slices" and suggests to move it to the end of the import list
- path: tools/protovalidate-conformance/internal/results/result.go
linters:
- gci
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Without ignoring it, running golangci-lint with --fix would update this file's import list to

    "cmp"
	"github.com/bufbuild/protovalidate/tools/internal/gen/buf/validate"
	"github.com/bufbuild/protovalidate/tools/internal/gen/buf/validate/conformance/harness"
	"slices"

# Building the conformance test suites
- path: tools/protovalidate-conformance/internal/cases/
linters:
Expand Down
6 changes: 5 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ lint: lint-proto lint-go ## Lint code and protos

.PHONY: lint-go
lint-go: $(BIN)/golangci-lint
$(BIN)/golangci-lint run ./tools/...
$(BIN)/golangci-lint run --modules-download-mode=readonly --timeout=3m0s ./tools/...

.PHONY: lint-go-fix
lint-go-fix: $(BIN)/golangci-lint
$(BIN)/golangci-lint run --fix --modules-download-mode=readonly --timeout=3m0s ./tools/...

.PHONY: lint-proto
lint-proto: $(BIN)/buf
Expand Down
2 changes: 1 addition & 1 deletion go.work
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.18
go 1.21

use (
./tools
Expand Down
1 change: 1 addition & 0 deletions go.work.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
Expand Down
2 changes: 1 addition & 1 deletion tools/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/bufbuild/protovalidate/tools

go 1.18
go 1.21

require (
github.com/bufbuild/protocompile v0.6.0
Expand Down
1 change: 1 addition & 0 deletions tools/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
Expand Down