From da85a3a96fb18e5e06536b9c15af7e31d9f22c76 Mon Sep 17 00:00:00 2001 From: Mike Kruskal <62662355+mkruskal-google@users.noreply.github.com> Date: Wed, 5 Jul 2023 14:41:13 -0700 Subject: [PATCH] Update upb dep to the latest 23.x commit (#13215) * Update upb dep to the latest 23.x commit * Fix objectivec test failure in Bazel 6+. This fix works in Bazel 5 and 6, but the original `import pddm` only works in Bazel 5. This is preventing our upgrade to Bazel 6 that will reduce our mac flakes in CI. PiperOrigin-RevId: 543565397 * Bump heap size for linkage monitor tests --- .github/workflows/test_java.yml | 2 +- objectivec/DevTools/pddm_tests.py | 2 +- protobuf_deps.bzl | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_java.yml b/.github/workflows/test_java.yml index d8a8522263..63c8d52c88 100644 --- a/.github/workflows/test_java.yml +++ b/.github/workflows/test_java.yml @@ -72,7 +72,7 @@ jobs: - name: Download Linkage Monitor run: curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/linkage-monitor-latest-all-deps.jar" - name: Fails if there's new linkage errors compared with baseline - run: java -Xmx2048m -jar linkage-monitor-latest-all-deps.jar com.google.cloud:libraries-bom + run: java -Xmx4096m -jar linkage-monitor-latest-all-deps.jar com.google.cloud:libraries-bom protobuf-bom: name: Protobuf Maven BOM diff --git a/objectivec/DevTools/pddm_tests.py b/objectivec/DevTools/pddm_tests.py index 2d9c47fba0..493406063b 100755 --- a/objectivec/DevTools/pddm_tests.py +++ b/objectivec/DevTools/pddm_tests.py @@ -35,7 +35,7 @@ import io import unittest -import pddm +from objectivec.DevTools import pddm class TestParsingMacros(unittest.TestCase): diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index e17b4ed2de..37cef50a26 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -151,7 +151,7 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "1956df14832979471d0c79210a817aeb54f7a526", - sha256 = "102039feae921205690d28561d6c74ba13e0561a76d7247de5df7d7cc8d72ca6", + commit = "455cfdb8ae60a1763e6d924e36851c6897a781bb", + sha256 = "2c8b4e961c38fcc7c58e8aca807cc3cc5190f42afdf39551ce49812b130493de", patches = ["@com_google_protobuf//build_defs:upb.patch"], )