Properly using upb's upstream.

pull/19433/head
Nicolas "Pixel" Noble 6 years ago
parent a1189961af
commit a4608cb373
  1. 2
      .gitmodules
  2. 6
      bazel/grpc_deps.bzl
  3. 2
      third_party/upb
  4. 2
      tools/run_tests/sanity/check_submodules.sh

2
.gitmodules vendored

@ -53,4 +53,4 @@
url = https://github.com/envoyproxy/protoc-gen-validate.git
[submodule "third_party/upb"]
path = third_party/upb
url = https://github.com/google/upb.git
url = https://github.com/protocolbuffers/upb.git

@ -206,9 +206,9 @@ def grpc_deps():
if "upb" not in native.existing_rules():
http_archive(
name = "upb",
sha256 = "67874e217f39e66a3015f51dcdc6831575c25f2260fff9b80482f190278ea586",
strip_prefix = "upb-4d8af5e4b998fccc8c9a5d5505866f4722f64954",
url = "https://github.com/nicolasnoble/upb/archive/4d8af5e4b998fccc8c9a5d5505866f4722f64954.tar.gz",
sha256 = "1107ca1ea9aef3880b60ffb2179d06970394f1d6b62d0565e72b544b4924468d",
strip_prefix = "upb-1ee1e362565f681fdd46f16bf9f70f51c905ddd4",
url = "https://github.com/protocolbuffers/upb/archive/1ee1e362565f681fdd46f16bf9f70f51c905ddd4.tar.gz",
)
if "envoy_api" not in native.existing_rules():
http_archive(

2
third_party/upb vendored

@ -1 +1 @@
Subproject commit 312c6b421a3c749e4f7c0e2193d4775cb997cff7
Subproject commit 1ee1e362565f681fdd46f16bf9f70f51c905ddd4

@ -40,7 +40,7 @@ cat << EOF | awk '{ print $1 }' | sort > "$want_submodules"
9245d481eb3e890f708ff2d7dadf2a10c04748ba third_party/libcxxabi (heads/release_60)
09745575a923640154bcf307fba8aedff47f240a third_party/protobuf (v3.7.0-rc.2-247-g09745575)
e143189bf6f37b3957fb31743df6a1bcf4a8c685 third_party/protoc-gen-validate (v0.0.10)
ce3ba4dcdcd34d85672d93bd552e8bc871f02b53 third_party/upb (heads/master)
1ee1e362565f681fdd46f16bf9f70f51c905ddd4 third_party/upb (heads/master)
cacf7f1d4e3d44d871b605da3b647f07d718623f third_party/zlib (v1.2.11)
EOF

Loading…
Cancel
Save