From 2609255f0f0ff83a138fb8717c8e5f5d92efd51c Mon Sep 17 00:00:00 2001 From: Walter Schulze Date: Tue, 22 Oct 2024 21:19:11 +0100 Subject: [PATCH] and fix build --- .github/workflows/build.yml | 5 ----- tools/tools.go | 9 +++++++++ validator/gen-validator-tests/Makefile | 16 ++++++++-------- 3 files changed, 17 insertions(+), 13 deletions(-) create mode 100644 tools/tools.go diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d2226d..a3e515d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,6 @@ jobs: with: repository: gogo/protobuf path: gopath/github.com/gogo/protobuf - - name: Checkout testsuite - uses: actions/checkout@v4 - with: - repository: katydid/testsuite - path: gopath/github.com/katydid/testsuite - name: Setup Go uses: actions/setup-go@v3 with: diff --git a/tools/tools.go b/tools/tools.go new file mode 100644 index 0000000..cfa53e3 --- /dev/null +++ b/tools/tools.go @@ -0,0 +1,9 @@ +//go:build tools +// +build tools + +// tools is a dummy package that will be ignored for builds, but included for dependencies +package tools + +import ( + _ "github.com/gogo/protobuf/protoc-gen-gogo" +) diff --git a/validator/gen-validator-tests/Makefile b/validator/gen-validator-tests/Makefile index 5810718..1eac8e4 100644 --- a/validator/gen-validator-tests/Makefile +++ b/validator/gen-validator-tests/Makefile @@ -2,12 +2,12 @@ gofmt: gofmt -l -s -w . regenerate: - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf person.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf srctree.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf treeregister.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf typewriterprison.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf puddingmilkshake.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf topsyturvy.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf knot.proto) - (protoc --gogo_out=. -I=.:$(GOPATH)/src/:$(GOPATH)/src/github.com/gogo/protobuf/protobuf banana.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf person.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf srctree.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf treeregister.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf typewriterprison.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf puddingmilkshake.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf topsyturvy.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf knot.proto) + (protoc --gogo_out=. -I=.:../../../../..//src/:../../../../..//src/github.com/gogo/protobuf/protobuf banana.proto) find . -name "*.pb.go" | xargs gofmt -l -s -w