Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #1634

Merged
merged 13 commits into from
Aug 7, 2018
35 changes: 18 additions & 17 deletions go/private/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def go_rules_dependencies():
git_repository,
name = "bazel_gazelle",
remote = "https://github.com/bazelbuild/bazel-gazelle",
commit = "7f30ba724af9495b221e2df0f5ac58511179485f", # master as of 2018-05-08
commit = "bfb9a4d2a5e6785c792f6fabd5238f8a33e60768", # master as of 2018-08-06
)

# Old version of buildtools, before breaking API changes. Old versions of
Expand All @@ -51,11 +51,12 @@ def go_rules_dependencies():
_maybe(
http_archive,
name = "org_golang_x_tools",
# release-branch.go1.9, as of 2017-08-25
urls = ["https://codeload.github.com/golang/tools/zip/5d2fd3ccab986d52112bf301d47a819783339d0e"],
strip_prefix = "tools-5d2fd3ccab986d52112bf301d47a819783339d0e",
# master, as of 2018-08-07
urls = ["https://codeload.github.com/golang/tools/zip/3c07937fe18c27668fd78bbaed3d6b8b39e202ea"],
strip_prefix = "tools-3c07937fe18c27668fd78bbaed3d6b8b39e202ea",
type = "zip",
overlay = manifest["org_golang_x_tools"],
# importpath = "golang.org/x/tools",
)

_maybe(
Expand All @@ -72,23 +73,23 @@ def go_rules_dependencies():
git_repository,
name = "com_github_golang_protobuf",
remote = "https://github.com/golang/protobuf",
commit = "b4deda0973fb4c70b50d226b1af49f3da59f5265", # v1.1.0, as of 2018-07-03
commit = "b4deda0973fb4c70b50d226b1af49f3da59f5265", # v1.1.0, as of 2018-08-06
overlay = manifest["com_github_golang_protobuf"],
# Contains manual modifications to build files. Update with care.
)
_maybe(
http_archive,
name = "com_google_protobuf",
# v3.6.0.1, latest as of 2018-07-03
urls = ["https://codeload.github.com/google/protobuf/zip/ce044817c7ba0aea27c3fd8e496635d94d20a755"],
strip_prefix = "protobuf-ce044817c7ba0aea27c3fd8e496635d94d20a755",
# v3.6.1, latest as of 2018-08-06
urls = ["https://codeload.github.com/google/protobuf/zip/48cb18e5c419ddd23d9badcfe4e9df7bde1979b2"],
strip_prefix = "protobuf-48cb18e5c419ddd23d9badcfe4e9df7bde1979b2",
type = "zip",
)
_maybe(
git_repository,
name = "com_github_mwitkow_go_proto_validators",
remote = "https://github.com/mwitkow/go-proto-validators",
commit = "0950a79900071e9f3f5979b78078c599376422fd", # master, as of 2018-07-03
commit = "0950a79900071e9f3f5979b78078c599376422fd", # master, as of 2018-08-06
overlay = manifest["com_github_mwitkow_go_proto_validators"],
# build_file_proto_mode = "disable",
# importpath = "github.com/mwitkow/go-proto-validators",
Expand All @@ -97,7 +98,7 @@ def go_rules_dependencies():
git_repository,
name = "com_github_gogo_protobuf",
remote = "https://github.com/gogo/protobuf",
commit = "1adfc126b41513cc696b209667c8656ea7aac67c", # v1.0.0, as of 2018-07-03
commit = "636bf0302bc95575d69441b25a2603156ffdddf1", # v1.1.1, as of 2018-08-06
overlay = manifest["com_github_gogo_protobuf"],
# importpath = "github.com/gogo/protobuf",
# build_file_proto_mode = "legacy",
Expand All @@ -112,23 +113,23 @@ def go_rules_dependencies():
git_repository,
name = "org_golang_x_net",
remote = "https://github.com/golang/net",
commit = "ed29d75add3d7c4bf7ca65aac0c6df3d1420216f", # master as of 2018-07-03
commit = "f4c29de78a2a91c00474a2e689954305c350adf9", # master as of 2018-08-06
overlay = manifest["org_golang_x_net"],
# importpath = "golang.org/x/net",
)
_maybe(
git_repository,
name = "org_golang_x_text",
remote = "https://github.com/golang/text",
commit = "f21a4dfb5e38f5895301dc265a8def02365cc3d0", # v0.3.0, latest as of 2018-07-03
commit = "f21a4dfb5e38f5895301dc265a8def02365cc3d0", # v0.3.0, latest as of 2018-08-06
overlay = manifest["org_golang_x_text"],
# importpath = "golang.org/x/text",
)
_maybe(
git_repository,
name = "org_golang_google_grpc",
remote = "https://github.com/grpc/grpc-go",
commit = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8", # v1.13.0, latest as of 2018-07-03
commit = "32fb0ac620c32ba40a4626ddf94d90d12cce3455", # v1.14.0, latest as of 2018-08-06
overlay = manifest["org_golang_google_grpc"],
# build_file_proto_mode = "disable",
# importpath = "google.golang.org/grpc",
Expand All @@ -137,7 +138,7 @@ def go_rules_dependencies():
git_repository,
name = "org_golang_google_genproto",
remote = "https://github.com/google/go-genproto",
commit = "ff3583edef7de132f219f0efc00e097cabcc0ec0", # master as of 2018-07-03
commit = "daca94659cb50e9f37c1b834680f2e46358f10b0", # master as of 2018-08-06
overlay = manifest["org_golang_google_genproto"],
# build_file_proto_mode = "disable_global",
# importpath = "google.golang.org/genproto",
Expand All @@ -146,8 +147,8 @@ def go_rules_dependencies():
http_archive,
name = "go_googleapis",
# master as of 2018-07-01
urls = ["https://codeload.github.com/googleapis/googleapis/zip/6a3277c0656219174ff7c345f31fb20a90b30b97"],
strip_prefix = "googleapis-6a3277c0656219174ff7c345f31fb20a90b30b97",
urls = ["https://codeload.github.com/googleapis/googleapis/zip/f47204e81e5aee2c1dfc7cc5ea729aa2fbaa7603"],
strip_prefix = "googleapis-f47204e81e5aee2c1dfc7cc5ea729aa2fbaa7603",
type = "zip",
overlay = manifest["go_googleapis"],
)
Expand All @@ -165,7 +166,7 @@ def go_rules_dependencies():
git_repository,
name = "com_github_kevinburke_go_bindata",
remote = "https://github.com/kevinburke/go-bindata",
commit = "95df019c0747a093fef2832ae530a37fd2766d16", # v3.7.0, latest as of 2018-07-03
commit = "06af60a4461b70d84a2b173d92f9f425d78baf55", # v3.11.0, latest as of 2018-08-06
overlay = manifest["com_github_kevinburke_go_bindata"],
# importpath = "github.com/kevinburke/go-bindata",
)
Expand Down
9 changes: 7 additions & 2 deletions tests/integration/popular_repos/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ test_suite(
"@org_golang_x_net//html/atom:go_default_test",
"@org_golang_x_net//http/httpguts:go_default_test",
"@org_golang_x_net//http/httpproxy:go_default_test",
"@org_golang_x_net//http2/h2c:go_default_test",
"@org_golang_x_net//http2/hpack:go_default_test",
"@org_golang_x_net//idna:go_default_test",
"@org_golang_x_net//internal/socket:go_default_test",
Expand All @@ -94,6 +95,7 @@ test_suite(
test_suite(
name = "org_golang_x_sys",
tests = [
"@org_golang_x_sys//cpu:go_default_test",
"@org_golang_x_sys//plan9:go_default_test",
"@org_golang_x_sys//windows:go_default_test",
"@org_golang_x_sys//windows/registry:go_default_test",
Expand Down Expand Up @@ -148,6 +150,7 @@ test_suite(
name = "org_golang_x_tools",
tests = [
"@org_golang_x_tools//benchmark/parse:go_default_test",
"@org_golang_x_tools//blog:go_default_test",
"@org_golang_x_tools//cmd/benchcmp:go_default_test",
"@org_golang_x_tools//cmd/callgraph/testdata/src/pkg:go_default_test",
"@org_golang_x_tools//cmd/digraph:go_default_test",
Expand All @@ -158,12 +161,12 @@ test_suite(
"@org_golang_x_tools//go/callgraph/static:go_default_test",
"@org_golang_x_tools//go/types/typeutil:go_default_test",
"@org_golang_x_tools//go/vcs:go_default_test",
"@org_golang_x_tools//godoc:go_default_test",
"@org_golang_x_tools//godoc/redirect:go_default_test",
"@org_golang_x_tools//godoc/vfs:go_default_test",
"@org_golang_x_tools//godoc/vfs/gatefs:go_default_test",
"@org_golang_x_tools//godoc/vfs/mapfs:go_default_test",
"@org_golang_x_tools//godoc/vfs/zipfs:go_default_test",
"@org_golang_x_tools//imports:go_default_test",
"@org_golang_x_tools//internal/fastwalk:go_default_test",
"@org_golang_x_tools//playground/socket:go_default_test",
"@org_golang_x_tools//present:go_default_test",
],
Expand All @@ -185,6 +188,8 @@ test_suite(
"@org_golang_google_grpc//credentials/alts/core/handshaker/service:go_default_test",
"@org_golang_google_grpc//encoding/proto:go_default_test",
"@org_golang_google_grpc//grpclog:go_default_test",
"@org_golang_google_grpc//internal/channelz:go_default_test",
"@org_golang_google_grpc//internal/grpcsync:go_default_test",
"@org_golang_google_grpc//internal/leakcheck:go_default_test",
"@org_golang_google_grpc//metadata:go_default_test",
"@org_golang_google_grpc//naming:go_default_test",
Expand Down
9 changes: 7 additions & 2 deletions tests/integration/popular_repos/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ This runs tests from the repository `golang.org/x/net <https://golang.org/x/net>
* @org_golang_x_net//html/atom:go_default_test
* @org_golang_x_net//http/httpguts:go_default_test
* @org_golang_x_net//http/httpproxy:go_default_test
* @org_golang_x_net//http2/h2c:go_default_test
* @org_golang_x_net//http2/hpack:go_default_test
* @org_golang_x_net//idna:go_default_test
* @org_golang_x_net//internal/socket:go_default_test
Expand All @@ -91,6 +92,7 @@ ________________

This runs tests from the repository `golang.org/x/sys <https://golang.org/x/sys>`_

* @org_golang_x_sys//cpu:go_default_test
* @org_golang_x_sys//plan9:go_default_test
* @org_golang_x_sys//windows:go_default_test
* @org_golang_x_sys//windows/registry:go_default_test
Expand Down Expand Up @@ -147,6 +149,7 @@ __________________
This runs tests from the repository `golang.org/x/tools <https://golang.org/x/tools>`_

* @org_golang_x_tools//benchmark/parse:go_default_test
* @org_golang_x_tools//blog:go_default_test
* @org_golang_x_tools//cmd/benchcmp:go_default_test
* @org_golang_x_tools//cmd/callgraph/testdata/src/pkg:go_default_test
* @org_golang_x_tools//cmd/digraph:go_default_test
Expand All @@ -157,12 +160,12 @@ This runs tests from the repository `golang.org/x/tools <https://golang.org/x/to
* @org_golang_x_tools//go/callgraph/static:go_default_test
* @org_golang_x_tools//go/types/typeutil:go_default_test
* @org_golang_x_tools//go/vcs:go_default_test
* @org_golang_x_tools//godoc:go_default_test
* @org_golang_x_tools//godoc/redirect:go_default_test
* @org_golang_x_tools//godoc/vfs:go_default_test
* @org_golang_x_tools//godoc/vfs/gatefs:go_default_test
* @org_golang_x_tools//godoc/vfs/mapfs:go_default_test
* @org_golang_x_tools//godoc/vfs/zipfs:go_default_test
* @org_golang_x_tools//imports:go_default_test
* @org_golang_x_tools//internal/fastwalk:go_default_test
* @org_golang_x_tools//playground/socket:go_default_test
* @org_golang_x_tools//present:go_default_test

Expand All @@ -185,6 +188,8 @@ This runs tests from the repository `google.golang.org/grpc <https://google.gola
* @org_golang_google_grpc//credentials/alts/core/handshaker/service:go_default_test
* @org_golang_google_grpc//encoding/proto:go_default_test
* @org_golang_google_grpc//grpclog:go_default_test
* @org_golang_google_grpc//internal/channelz:go_default_test
* @org_golang_google_grpc//internal/grpcsync:go_default_test
* @org_golang_google_grpc//internal/leakcheck:go_default_test
* @org_golang_google_grpc//metadata:go_default_test
* @org_golang_google_grpc//naming:go_default_test
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/popular_repos/popular_repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def popular_repos():
go_repository,
name = "org_golang_x_sys",
importpath = "golang.org/x/sys",
commit = "0b25a408a50076fbbcae6b7ac0ea5fbb0b085e79",
commit = "acbc56fc7007d2a01796d5bde54f39e3b3e95945",
)
_maybe(
go_repository,
Expand Down
11 changes: 7 additions & 4 deletions tests/integration/popular_repos/popular_repos.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
dict(
name = "org_golang_x_sys",
importpath = "golang.org/x/sys",
commit = "0b25a408a50076fbbcae6b7ac0ea5fbb0b085e79",
commit = "acbc56fc7007d2a01796d5bde54f39e3b3e95945",
excludes = [
"unix:go_default_test", # TODO(#413): External test depends on symbols defined in internal test.
],
Expand Down Expand Up @@ -87,7 +87,6 @@
"go/callgraph/rta:go_default_test", # Needs testdata directory
"go/gccgoexportdata:go_default_test", # Needs testdata directory
"go/gcexportdata:go_default_test", # Needs testdata directory
"go/gcimporter15:go_default_test", # Needs testdata directory
"go/internal/gccgoimporter:go_default_test", # Needs testdata directory
"go/loader:go_default_test", # Needs testdata directory
"go/pointer:go_default_test", # Needs testdata directory
Expand All @@ -98,11 +97,15 @@
"cmd/fiximports:go_default_test", # requires working GOROOT, not present in CI.
"cmd/godoc:go_default_test", # TODO(#417)
"cmd/gorename:go_default_test", # TODO(#417)
"go/gcimporter15:go_default_test", # TODO(#417)
"refactor/importgraph:go_default_test", # TODO(#417)
"refactor/rename:go_default_test", # TODO(#417)
"cmd/guru/testdata/src/referrers:go_default_test", # Not a real test
"container/intsets:go_default_test", # TODO(#413): External test depends on symbols defined in internal test.
"go/internal/gcimporter:go_default_test", # Needs testdata directory
"go/packages:go_default_test", # Hah!
"godoc:go_default_test", # requires GOROOT and GOPATH
"godoc/static:go_default_test", # requires data files
"imports:go_default_test", # probably needs GOROOT
],
),

Expand All @@ -123,7 +126,7 @@
"credentials:go_default_test",
"credentials/alts:go_default_test", # not supported on darwin
":go_default_test",
"transport:go_default_test", # slow
"internal/transport:go_default_test", # slow
],
),

Expand Down
19 changes: 19 additions & 0 deletions third_party/com_github_gogo_protobuf/conformance/BUILD.bazel.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")

go_library(
name = "go_default_library",
srcs = ["conformance.go"],
importpath = "github.com/gogo/protobuf/conformance",
visibility = ["//visibility:private"],
deps = [
"//conformance/internal/conformance_proto:go_default_library",
"//jsonpb:go_default_library",
"//proto:go_default_library",
],
)

go_binary(
name = "conformance",
embed = [":go_default_library"],
visibility = ["//visibility:public"],
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")

filegroup(
name = "go_default_library_protos",
srcs = ["conformance.proto"],
visibility = ["//conformance:__subpackages__"],
)

go_library(
name = "go_default_library",
srcs = ["conformance.pb.go"],
importpath = "github.com/gogo/protobuf/conformance/internal/conformance_proto",
visibility = ["//conformance:__subpackages__"],
deps = [
"//proto:go_default_library",
"//types:go_default_library",
],
)
13 changes: 0 additions & 13 deletions third_party/com_github_gogo_protobuf/io/BUILD.bazel.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,6 @@ go_library(
deps = ["//proto:go_default_library"],
)

go_test(
name = "go_default_xtest",
srcs = [
"io_test.go",
"uint32_test.go",
],
deps = [
":go_default_library",
"//test:go_default_library",
"//test/example:go_default_library",
],
)

go_test(
name = "go_default_test",
srcs = [
Expand Down
34 changes: 8 additions & 26 deletions third_party/com_github_gogo_protobuf/proto/BUILD.bazel.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go_library(
name = "go_default_library",
srcs = [
"clone.go",
"custom_gogo.go",
"decode.go",
"decode_gogo.go",
"discard.go",
"duration.go",
"duration_gogo.go",
Expand All @@ -22,6 +22,11 @@ go_library(
"properties.go",
"properties_gogo.go",
"skip_gogo.go",
"table_marshal.go",
"table_marshal_gogo.go",
"table_merge.go",
"table_unmarshal.go",
"table_unmarshal_gogo.go",
"text.go",
"text_gogo.go",
"text_parser.go",
Expand All @@ -39,6 +44,7 @@ go_test(
"any_test.go",
"clone_test.go",
"decode_test.go",
"discard_test.go",
"encode_test.go",
"equal_test.go",
"extensions_test.go",
Expand All @@ -53,31 +59,7 @@ go_test(
embed = [":go_default_library"],
deps = [
"//proto/proto3_proto:go_default_library",
"//proto/testdata:go_default_library",
"//types:go_default_library",
],
)

go_test(
name = "go_default_xtest",
srcs = [
"all_test.go",
"any_test.go",
"clone_test.go",
"decode_test.go",
"encode_test.go",
"equal_test.go",
"extensions_test.go",
"map_test.go",
"proto3_test.go",
"size_test.go",
"text_parser_test.go",
"text_test.go",
],
deps = [
":go_default_library",
"//proto/proto3_proto:go_default_library",
"//proto/testdata:go_default_library",
"//proto/test_proto:go_default_library",
"//types:go_default_library",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//proto:go_default_library",
"//proto/testdata:go_default_library",
"//proto/test_proto:go_default_library",
"//types:go_default_library",
],
)
Loading