Merge pull request #997 from asynkron/update-build-scripts

update build files
asynkron · Dec 20, 2023 · aedca58 · aedca58
2 parents ca1d05b + 6bb029e
commit aedca58
Show file tree

Hide file tree

Showing 10 changed files with 187 additions and 14 deletions.
diff --git a/_examples/cluster-basic/shared/build.sh b/_examples/cluster-basic/shared/build.sh
@@ -1,2 +1,3 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=. -I=$GOPATH/src --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
+
diff --git a/_examples/cluster-basic/shared/protos_grain.pb.go b/_examples/cluster-basic/shared/protos_grain.pb.go
diff --git a/_examples/cluster-eventstream-broadcast/build.sh b/_examples/cluster-eventstream-broadcast/build.sh
@@ -1,2 +1,3 @@
 protoc --go_out=. --go_opt=paths=source_relative --proto_path=. protos.proto
-protoc -I=. -I=$GOPATH/src --gograinv2_out=. protos.proto
+protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
+
diff --git a/_examples/cluster-eventstream-broadcast/protos_grain.pb.go b/_examples/cluster-eventstream-broadcast/protos_grain.pb.go
diff --git a/_examples/cluster-metrics/Makefile b/_examples/cluster-metrics/Makefile
@@ -16,4 +16,5 @@ stop:
 
 proto:
 	protoc -I=.  --gogoslick_out=. shared/*.proto
-	protoc -I=.  --gograinv2_out=. shared/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto
+
diff --git a/_examples/cluster-pubsub/protos_grain.pb.go b/_examples/cluster-pubsub/protos_grain.pb.go
diff --git a/_examples/cluster-reentrancy/go.mod b/_examples/cluster-reentrancy/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/uuid v1.4.0 // indirect
+	github.com/google/uuid v1.5.0 // indirect
 	github.com/lithammer/shortuuid/v4 v4.0.0 // indirect
 	github.com/lmittmann/tint v1.0.3 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
@@ -36,9 +36,9 @@ require (
 	go.opentelemetry.io/otel/sdk/metric v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
-	golang.org/x/net v0.18.0 // indirect
-	golang.org/x/sys v0.14.0 // indirect
+	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/grpc v1.59.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
+	google.golang.org/grpc v1.60.1 // indirect
 )
diff --git a/_examples/cluster-reentrancy/hello.pb.go b/_examples/cluster-reentrancy/hello.pb.go
diff --git a/_examples/cluster-reentrancy/hello_grain.pb.go b/_examples/cluster-reentrancy/hello_grain.pb.go
diff --git a/_examples/cluster-restartgracefully/Makefile b/_examples/cluster-restartgracefully/Makefile
@@ -43,4 +43,4 @@ stop:
 
 proto:
 	protoc -I=.  --gogoslick_out=. shared/*.proto
-	protoc -I=.  --gograinv2_out=.   shared/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=$GOPATH/bin/protoc-gen-go-grain --go-grain_out=. --go-grain_opt=paths=source_relative protos.proto