Skip to content

Commit

Permalink
Revert "Migrate to go_repo"
Browse files Browse the repository at this point in the history
This reverts commit 3a1fb2c.

This only seems to make things worse.
  • Loading branch information
peterebden committed Feb 12, 2024
1 parent 3a1fb2c commit 1b5e2ae
Show file tree
Hide file tree
Showing 3 changed files with 114 additions and 50 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
.idea
plz-out
.plzconfig.local
5 changes: 2 additions & 3 deletions .plzconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ ProtocTool = //third_party/proto:protoc
LanguageDef = //build_defs:go_proto

[Plugin "go_proto"]
GrpcPlugin = ///third_party/go/google.golang.org_grpc_cmd_protoc-gen-go-grpc//:protoc-gen-go-grpc
ProtoPlugin = ///third_party/go/google.golang.org_protobuf//cmd/protoc-gen-go
ProtoDep = //third_party/go:google.golang.org.protobuf
GrpcPlugin = //third_party/go:protoc-gen-go-grpc
ProtoPlugin = //third_party/go:protoc-gen-go

[PluginDefinition]
Name = go_proto
Expand Down
158 changes: 112 additions & 46 deletions third_party/go/BUILD
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
subinclude("///go//build_defs:go")

go_toolchain(
name = "toolchain",
version = "1.22.0",
version = "1.17",
)

go_repo(
module = "github.com/davecgh/go-spew",
go_module(
name = "go-spew",
install = ["spew"],
licences = ["ISC"],
module = "github.com/davecgh/go-spew",
version = "v1.1.0",
visibility = ["PUBLIC"],
)

go_repo(
module = "github.com/pmezard/go-difflib",
go_module(
name = "go-difflib",
install = ["difflib"],
licences = ["BSD-3-Clause"],
module = "github.com/pmezard/go-difflib",
version = "v1.0.0",
visibility = ["PUBLIC"],
)

go_repo(
module = "gopkg.in/yaml.v3",
go_module(
name = "yaml.v3",
install = ["."],
licences = ["MIT"],
module = "gopkg.in/yaml.v3",
version = "v3.0.0-20200313102051-9f266ea9e77c",
visibility = ["PUBLIC"],
)

go_repo(
module = "github.com/stretchr/testify",
go_module(
name = "testify",
install = [
".",
Expand All @@ -40,47 +37,53 @@ go_repo(
"require",
"suite",
],
licences = ["MIT"],
module = "github.com/stretchr/testify",
version = "v1.7.0",
visibility = ["PUBLIC"],
deps = [
":go-difflib",
":go-spew",
":objx",
":yaml.v3",
],
)

go_repo(
module = "github.com/stretchr/objx",
go_module(
name = "objx",
install = ["."],
licences = ["MIT"],
module = "github.com/stretchr/objx",
version = "v0.1.0",
visibility = ["PUBLIC"],
)

go_repo(
module = "golang.org/x/text",
go_module(
name = "text",
install = [
"secure/bidirule",
"transform",
"unicode/bidi",
"unicode/norm",
],
licences = ["BSD-3-Clause"],
module = "golang.org/x/text",
version = "v0.3.0",
visibility = ["PUBLIC"],
)

go_repo(
module = "github.com/golang/protobuf",
go_module(
name = "protobuf",
exported_deps = [":google.golang.org.protobuf"],
install = [
"proto",
"ptypes",
"ptypes/any",
"ptypes/duration",
"ptypes/timestamp",
],
licences = ["BSD-3-Clause"],
module = "github.com/golang/protobuf",
version = "v1.4.3",
visibility = ["PUBLIC"],
)

go_repo(
module = "google.golang.org/grpc",
go_module(
name = "grpc",
install = [
".",
Expand All @@ -97,6 +100,29 @@ go_repo(
"encoding",
"encoding/proto",
"grpclog",
"internal",
"internal/backoff",
"internal/balancerload",
"internal/binarylog",
"internal/buffer",
"internal/channelz",
"internal/credentials",
"internal/envconfig",
"internal/grpclog",
"internal/grpcrand",
"internal/grpcsync",
"internal/grpcutil",
"internal/metadata",
"internal/resolver",
"internal/resolver/dns",
"internal/resolver/passthrough",
"internal/resolver/unix",
"internal/serviceconfig",
"internal/status",
"internal/syscall",
"internal/transport",
"internal/transport/networktype",
"internal/xds/env",
"keepalive",
"metadata",
"peer",
Expand All @@ -106,18 +132,33 @@ go_repo(
"status",
"tap",
],
licences = ["Apache-2.0"],
module = "google.golang.org/grpc",
version = "v1.42.0",
visibility = ["PUBLIC"],
deps = [
":genproto",
":google.golang.org.protobuf",
":net",
":protobuf",
":sys",
],
)

go_repo(
go_mod_download(
name = "protobuf_dl",
module = "google.golang.org/protobuf",
version = "v1.27.1",
)

go_module(
name = "google.golang.org.protobuf",
download = ":protobuf_dl",
install = [
"cmd/protoc-gen-go/internal_gengo",
"compiler/protogen",
"encoding/prototext",
"encoding/protowire",
"internal/...",
"proto",
"reflect/protodesc",
"reflect/protoreflect",
Expand All @@ -130,54 +171,79 @@ go_repo(
"types/known/timestamppb",
"types/pluginpb",
],
licences = ["BSD-3-Clause"],
version = "v1.27.1",
module = "google.golang.org/protobuf",
)

go_repo(
go_module(
name = "protoc-gen-go-grpc",
binary = True,
module = "google.golang.org/grpc/cmd/protoc-gen-go-grpc",
name = "google.golang.org_grpc_cmd_protoc-gen-go-grpc",
licences = ["Apache-2.0"],
version = "v1.1.0",
visibility = ["PUBLIC"],
deps = [":google.golang.org.protobuf"],
)

go_repo(
module = "golang.org/x/net",
go_module(
name = "protoc-gen-go",
binary = True,
download = ":protobuf_dl",
install = ["cmd/protoc-gen-go"],
module = "google.golang.org/protobuf",
visibility = ["PUBLIC"],
deps = [":google.golang.org.protobuf"],
)

go_module(
name = "net",
install = [
"http/httpguts",
"http2",
"http2/hpack",
"idna",
"internal/timeseries",
"trace",
],
licences = ["BSD-3-Clause"],
module = "golang.org/x/net",
version = "v0.0.0-20200822124328-c89045814202",
visibility = ["PUBLIC"],
deps = [":text"],
)

go_repo(
module = "golang.org/x/sys",
go_module(
name = "sys",
install = ["..."],
licences = ["BSD-3-Clause"],
module = "golang.org/x/sys",
version = "v0.0.0-20220315194320-039c03cc5b86",
visibility = ["PUBLIC"],
)

go_repo(
module = "google.golang.org/genproto",
go_module(
name = "genproto",
install = ["googleapis/rpc/status"],
licences = ["Apache-2.0"],
module = "google.golang.org/genproto",
version = "v0.0.0-20200526211855-cb27e3aa2013",
visibility = ["PUBLIC"],
deps = [
":google.golang.org.protobuf",
":protobuf",
],
)

go_repo(
module = "github.com/google/go-cmp",
go_module(
name = "go-cmp",
install = [
"cmp",
"cmp/cmpopts",
"cmp/internal/diff",
"cmp/internal/flags",
"cmp/internal/function",
"cmp/internal/testprotos",
"cmp/internal/teststructs",
"cmp/internal/teststructs/foo1",
"cmp/internal/teststructs/foo2",
"cmp/internal/value",
],
licences = ["BSD-3-Clause"],
module = "github.com/google/go-cmp",
version = "v0.5.6",
visibility = ["PUBLIC"],
)

0 comments on commit 1b5e2ae

Please sign in to comment.