Fix intermittent iOS CppUnitTests build race (#4402)

This commit is contained in:
Bart Louwers
2026-07-14 01:18:49 +02:00
committed by GitHub
parent d4ae69d3bc
commit f442c704b8
3 changed files with 24 additions and 0 deletions

View File

@@ -14,6 +14,17 @@ bazel_dep(name = "rules_shell", version = "0.6.1")
bazel_dep(name = "rules_swift_package_manager", version = "1.3.0")
bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
# rules_xcodeproj accidentally includes a trailing comma in the generated
# Testing.framework rsync exclusion, causing intermittent test-host build races.
# TODO: Remove this override once the upstream fix is released:
# https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3321
single_version_override(
module_name = "rules_xcodeproj",
patch_strip = 1,
patches = ["//bazel/patches/rules_xcodeproj:testing-framework.patch"],
version = "3.3.0",
)
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node", dev_dependency = True)
node.toolchain(node_version = "20.14.0")

View File

@@ -0,0 +1 @@
exports_files(["testing-framework.patch"])

View File

@@ -0,0 +1,12 @@
diff --git a/xcodeproj/internal/bazel_integration_files/BUILD b/xcodeproj/internal/bazel_integration_files/BUILD
--- a/xcodeproj/internal/bazel_integration_files/BUILD
+++ b/xcodeproj/internal/bazel_integration_files/BUILD
@@ -52,7 +52,7 @@ frameworks=(
'libclang_rt.ubsan*.dylib'
'libXCTestBundleInject.dylib'
'libXCTestSwiftSupport.dylib'
- 'Testing.framework',
+ 'Testing.framework'
'XCTAutomationSupport.framework'
'XCTest.framework'
'XCTestCore.framework'