Fix intermittent iOS CppUnitTests build race (#4402)
This commit is contained in:
11
MODULE.bazel
11
MODULE.bazel
@@ -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")
|
||||
|
||||
|
||||
1
bazel/patches/rules_xcodeproj/BUILD.bazel
Normal file
1
bazel/patches/rules_xcodeproj/BUILD.bazel
Normal file
@@ -0,0 +1 @@
|
||||
exports_files(["testing-framework.patch"])
|
||||
12
bazel/patches/rules_xcodeproj/testing-framework.patch
Normal file
12
bazel/patches/rules_xcodeproj/testing-framework.patch
Normal 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'
|
||||
Reference in New Issue
Block a user