Merge pull request #11196 from ericsalo/21.x

sync with current 21.x upb
2 years ago · c0bc0cf076
parent d024e3bca1 9d17e97927
commit c0bc0cf076
6 changed files with 24179 additions and 19552 deletions
--- a/kokoro/macos/prepare_build_macos_rc
+++ b/kokoro/macos/prepare_build_macos_rc
@ -36,7 +36,7 @@ pyenv install -v -s 2.7.18 && pyenv global 2.7.18
 if [[ "${KOKORO_INSTALL_TOX:-}" == "yes" ]] ; then
  pyenv install -v -s 3.7.13
  pyenv global 3.7.13
-  sudo python -m pip install --upgrade pip tox tox-pyenv
+  sudo python -m pip install --upgrade pip 'tox==3.27.1' tox-pyenv
 fi
 ##
--- a/php/ext/google/protobuf/php-upb.c
+++ b/php/ext/google/protobuf/php-upb.c
--- a/php/ext/google/protobuf/php-upb.h
+++ b/php/ext/google/protobuf/php-upb.h
--- a/protobuf_deps.bzl
+++ b/protobuf_deps.bzl
@ -117,6 +117,6 @@ def protobuf_deps():
        _github_archive(
            name = "upb",
            repo = "https://github.com/protocolbuffers/upb",
-            commit = "79462f8a654ef782e149f59cb07d930269af951a",
+            commit = "969f6fdb88e94ced87953e53716893c68ec7b1ce",
-            sha256 = "1613eae24fdd0cd7b570860123502f336939094de9af5777815f63ac86ef8d0c",
+            sha256 = "6754b7f95c92f69a832a82931aea40d066cc689dbc1eb3348b84c1ed95285296",
        )
--- a/ruby/ext/google/protobuf_c/ruby-upb.c
+++ b/ruby/ext/google/protobuf_c/ruby-upb.c
--- a/ruby/ext/google/protobuf_c/ruby-upb.h
+++ b/ruby/ext/google/protobuf_c/ruby-upb.h