Merge branch 'main' into fix-git-history

1 year ago · 58ea4c8eef
parent 895f190bda 6ec2869102
commit 58ea4c8eef
1 changed files with 9 additions and 0 deletions
--- a/9
+++ b/9
@ -7,6 +7,15 @@ local_repository(
    path = "examples",
 )

+# We will soon merge upb and protobuf into the same Bazel repository, but for
+# now we depend on the separate Bazel repo in the upb/ directory. This is
+# important to ensure that the CI tests exercise upb at head instead of relying
+# on a stale version from protobuf_deps.bzl.
+local_repository(
+    name = "upb",
+    path = "upb",
+)
+
 # Load common dependencies first to ensure we use the correct version
 load("//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "protobuf_deps")