and fix build

katydid · Oct 22, 2024 · 2609255 · 2609255
1 parent 7c519c8
commit 2609255
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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