Skip to content

Commit ead1002

Browse files
hlopkoCopybara-Service
authored and
Copybara-Service
committed
Fix protobuf in the WORKSPACE
Fixes https://buildkite.com/bazel/bazel-bazel/builds/4327#882adb9d-7a31-4df8-b94c-c11794ef4468 RELNOTES: None. PiperOrigin-RevId: 211619161
1 parent bcaad80 commit ead1002

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

WORKSPACE

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,20 +69,20 @@ bind(
6969

7070
new_local_repository(
7171
name = "com_google_protobuf",
72-
build_file = "./third_party/protobuf/3.6.0/BUILD",
73-
path = "./third_party/protobuf/3.6.0/",
72+
build_file = "./third_party/protobuf/3.6.1/BUILD",
73+
path = "./third_party/protobuf/3.6.1/",
7474
)
7575

7676
new_local_repository(
7777
name = "com_google_protobuf_cc",
78-
build_file = "./third_party/protobuf/3.6.0/BUILD",
79-
path = "./third_party/protobuf/3.6.0/",
78+
build_file = "./third_party/protobuf/3.6.1/BUILD",
79+
path = "./third_party/protobuf/3.6.1/",
8080
)
8181

8282
new_local_repository(
8383
name = "com_google_protobuf_java",
84-
build_file = "./third_party/protobuf/3.6.0/com_google_protobuf_java.BUILD",
85-
path = "./third_party/protobuf/3.6.0/",
84+
build_file = "./third_party/protobuf/3.6.1/com_google_protobuf_java.BUILD",
85+
path = "./third_party/protobuf/3.6.1/",
8686
)
8787

8888
new_local_repository(

src/main/protobuf/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package(default_visibility = ["//visibility:public"])
22

33
load("//tools/build_rules:genproto.bzl", "cc_grpc_library")
44
load("//tools/build_rules:utilities.bzl", "java_library_srcs")
5-
load("//third_party/protobuf/3.6.0:protobuf.bzl", "py_proto_library")
5+
load("//third_party/protobuf/3.6.1:protobuf.bzl", "py_proto_library")
66
load("//third_party/grpc:build_defs.bzl", "java_grpc_library")
77

88
exports_files(

src/test/shell/bazel/testdata/embedded_tools_srcs_deps

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
@com_google_protobuf//:protoc_lib
33
@com_google_protobuf//:protobuf
44
@com_google_protobuf//:protobuf_lite
5-
@com_google_protobuf//:js_embed
65
//tools/test:test_wrapper_bin
76
//third_party/ijar:zipper
87
//third_party/ijar:ijar

src/test/shell/testenv.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if [ "${MACHINE_TYPE}" = 's390x' ]; then
115115
fi
116116

117117
# Requires //third_party/protobuf:protoc
118-
protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.6.0/protoc"
118+
protoc_compiler="${BAZEL_RUNFILES}/third_party/protobuf/3.6.1/protoc"
119119

120120
if [ -z ${RUNFILES_MANIFEST_ONLY+x} ]; then
121121
junit_jar="${BAZEL_RUNFILES}/third_party/junit/junit-*.jar"

0 commit comments

Comments
 (0)