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.

Sign up for GitHub

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

Jump to bottom

Update protobuf to 3.7.1 #7681

Closed
wants to merge 7 commits into from
Closed

Update protobuf to 3.7.1 #7681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
026afdb
Update protobuf to 3.7.1 (PR 1)
davido Mar 9, 2019
1397b69
Update protobuf to 3.7.1 (PR 2)
davido Mar 9, 2019
d6e6e77
Update protobuf to 3.7.1 (PR 3)
davido Mar 9, 2019
32b911d
Update protobuf to 3.7.1 (PR 4)
davido Mar 9, 2019
9ae8ddd
Protobuf: Avoid dependency on bazel_skylib
davido Mar 14, 2019
c3d0610
Avoid protobuf dependency on zlib for integration tests
davido Mar 17, 2019
bc145f0
Remove examples/third_party/zlib.BUILD to satisfy srcs test
davido Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ bind(

new_local_repository(
name = "com_google_protobuf",
build_file = "./third_party/protobuf/3.6.1/BUILD",
path = "./third_party/protobuf/3.6.1/",
build_file = "./third_party/protobuf/3.7.1/BUILD",
path = "./third_party/protobuf/3.7.1/",
)

local_repository(
Expand Down
2 changes: 1 addition & 1 deletion src/main/protobuf/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])

load("//tools/build_rules:genproto.bzl", "cc_grpc_library")
load("//tools/build_rules:utilities.bzl", "java_library_srcs")
load("//third_party/protobuf/3.6.1:protobuf.bzl", "py_proto_library")
load("//third_party/protobuf/3.7.1:protobuf.bzl", "py_proto_library")
load("//third_party/grpc:build_defs.bzl", "java_grpc_library")

exports_files(
Expand Down
2 changes: 1 addition & 1 deletion src/test/shell/integration/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ sh_test(
srcs = ["modify_execution_info_test.sh"],
data = [
":test-deps",
"//third_party/protobuf/3.6.1:srcs",
"//third_party/protobuf/3.7.1:srcs",
"@bazel_tools//tools/bash/runfiles",
],
)
Expand Down
11 changes: 9 additions & 2 deletions src/test/shell/integration/modify_execution_info_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,21 @@ Genrule=+requires-a,CppCompile=+requires-b,CppCompile=+requires-c \
assert_contains "ExecutionInfo: {requires-a: ''" output
}

# TODO(davido): Find a way to re-use the same protobuf's BUILD file
function test_modify_execution_info_various_types() {
if [[ "$PRODUCT_NAME" = "bazel" ]]; then
# proto_library requires this external workspace.
cat >> WORKSPACE << EOF
workspace(name = "io_bazel")
new_local_repository(
name = "com_google_protobuf",
path = "$(dirname $(rlocation io_bazel/third_party/protobuf/3.6.1/BUILD))",
build_file = "$(rlocation io_bazel/third_party/protobuf/3.6.1/BUILD)",
path = "$(dirname $(rlocation io_bazel/third_party/protobuf/3.7.1/BUILD_without_zlib_dep.bazel))",
build_file = "$(rlocation io_bazel/third_party/protobuf/3.7.1/BUILD_without_zlib_dep.bazel)",
)
new_local_repository(
name = "zlib",
path = "$(dirname $(rlocation io_bazel/third_party/zlib/BUILD))",
build_file = "$(rlocation io_bazel/third_party/zlib/BUILD)",
)
EOF
fi
Expand Down
1,086 changes: 0 additions & 1,086 deletions third_party/protobuf/3.6.1/Makefile.am
View file
Open in desktop

This file was deleted.

Loading