Merge pull request protocolbuffers#9923 from haberman/update-upb2

Updated to upb for -rc1.
Playfulperidot · May 6, 2022 · 29d5ca8 · 29d5ca8
2 parents 5ebde5b + 49d6b35
commit 29d5ca8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl
@@ -114,6 +114,6 @@ def protobuf_deps():
         _github_archive(
             name = "upb",
             repo = "https://github.com/protocolbuffers/upb",
-            commit = "2abcb7dd8a524d73322082951d334392c76721b9",
-            sha256 = "f583f1389a7531940a51221b21b69a421b4c12811a91fb5df493cd0bb13ee5d6",
+            commit = "0e8772fc20e5a0a2fa1f326c79d494374871ef94",
+            sha256 = "2a7ccd5a8e20c5b2f6efafb305f734c7ad1cc5615706f7a35cd4fbad436d5101",
         )
diff --git a/protobuf_version.bzl b/protobuf_version.bzl
@@ -1,2 +1,6 @@
 PROTOC_VERSION = '3.20.1'
 PROTOBUF_JAVA_VERSION = '3.20.1'
+PROTOBUF_PYTHON_VERSION = '3.20.1'
+
+# Remove once upb has been updated to use PROTOBUF_PYTHON_VERSION instead.
+PROTOBUF_VERSION = PROTOBUF_PYTHON_VERSION