From 0ed4d13b008269e2087611010152ad2574f66b9d Mon Sep 17 00:00:00 2001 From: Peter Kurfer Date: Wed, 16 Aug 2023 18:31:32 +0200 Subject: [PATCH] fix: exclude gRPC code for WASI targets --- .buildr/config.hcl | 2 ++ .buildr/tasks.hcl | 36 ++++++++++++++++++++++++++++ generated/rpc/v1/executor_grpc.pb.go | 3 +++ go.mod | 18 ++++++++++++++ go.sum | 21 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 .buildr/config.hcl create mode 100644 .buildr/tasks.hcl create mode 100644 go.mod create mode 100644 go.sum diff --git a/.buildr/config.hcl b/.buildr/config.hcl new file mode 100644 index 0000000..cd4542c --- /dev/null +++ b/.buildr/config.hcl @@ -0,0 +1,2 @@ +buildr { +} \ No newline at end of file diff --git a/.buildr/tasks.hcl b/.buildr/tasks.hcl new file mode 100644 index 0000000..a58ae9a --- /dev/null +++ b/.buildr/tasks.hcl @@ -0,0 +1,36 @@ +task "script" "buf_generate" { + inline = [ + "buf generate" + ] + + out_dir = repo.root + + input_mapping = { + "api" = "api", + "buf.gen.yaml" = "buf.gen.yaml" + "buf.work.yaml" = "buf.work.yaml" + } + + container { + image = "docker.io/bufbuild/buf" + } +} + +task "script" "golangci_lint" { + inline = [ + "golangci-lint run -v" + ] + + container { + image = "golangci/golangci-lint" + } + + depends_on = [ + tasks.go_fmt.id, + tasks.go_generate.id, + ] + + input_mapping = { + "${repo.root}" = "." + } +} \ No newline at end of file diff --git a/generated/rpc/v1/executor_grpc.pb.go b/generated/rpc/v1/executor_grpc.pb.go index 3383e31..cf33391 100644 --- a/generated/rpc/v1/executor_grpc.pb.go +++ b/generated/rpc/v1/executor_grpc.pb.go @@ -1,3 +1,5 @@ +//go:build !wasi + // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 @@ -8,6 +10,7 @@ package rpcv1 import ( context "context" + grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..2fb0502 --- /dev/null +++ b/go.mod @@ -0,0 +1,18 @@ +module code.icb4dc0.de/buildr/api + +go 1.21 + +toolchain go1.21.0 + +require ( + google.golang.org/grpc v1.57.0 + google.golang.org/protobuf v1.31.0 +) + +require ( + github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/net v0.14.0 // indirect + golang.org/x/sys v0.11.0 // indirect + golang.org/x/text v0.12.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 // indirect +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..3636c3d --- /dev/null +++ b/go.sum @@ -0,0 +1,21 @@ +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +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= +golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14= +golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= +golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878 h1:lv6/DhyiFFGsmzxbsUUTOkN29II+zeWHxvT8Lpdxsv0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230815205213-6bfd019c3878/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= +google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=