Fix CI by pinning to old versions temporarily (#2802)

- Also fixes google/xctestrunner#70 but for
the other rule in this repo
- Adds xctestrunner patches which are needed for newer Xcode versions

---------

Signed-off-by: Aaron Sky <aaronsky@skyaaron.com>
Co-authored-by: Aaron Sky <aaronsky@skyaaron.com>

Author: keith

.bazelci/presubmit.yml

@@ -4,16 +4,15 @@ x_defaults:
   # it doesn't know about; so that is used to avoid repeating common subparts.
   common: &common
     platform: macos_arm64
+    xcode_version: "16.4"
     shell_commands:
     - xcrun simctl runtime list
-    - xcrun simctl runtime delete 22D8075 || true
-    - xcrun simctl runtime delete 21F79 || true
+    - xcodebuild -downloadPlatform iOS -buildVersion 18.5
+    - xcrun simctl runtime match set iphoneos18.5 22F77
     - xcrun simctl runtime list
     - xcrun simctl runtime match list
-    - xcrun simctl runtime match set xros2.2 22N895
-    - xcrun simctl runtime match list
     post_shell_commands:
-    - xcrun simctl runtime match set xros2.2 --default
+    - xcrun simctl runtime match set iphoneos18.5 --default
     - xcrun simctl runtime match list
     build_targets:
     - "tools/..."
@@ -36,24 +35,32 @@ x_defaults:
 # NOTE: To avoid listing the same things for build_flags/test_flags for each
 # of these tasks, they are listed in the .bazelrc instead.
 tasks:
-  macos_latest:
-    name: "Current LTS"
-    bazel: latest
+  macos_7.x:
+    name: "7.x"
+    bazel: 7.x
     <<: *common
 
-  macos_last_rc:
-    name: "Last RC Bazel"
-    bazel: last_rc
+  macos_8.x:
+    name: "8.x"
+    bazel: 8.x
     <<: *common
 
+  # TODO: Re-enable when we fix bazel 9.x
+  # macos_last_rc:
+  #   name: "Last RC Bazel"
+  #   bazel: last_rc
+  #   <<: *common
+
   macos_last_green:
     name: "Last Green Bazel"
-    bazel: last_green
+    # TODO: Move back to last_green ASAP
+    bazel: 5409637c4e2d5c010b7264172b1004a2afd46bfe
     <<: *common
 
   doc_tests:
     name: "Doc tests"
-    bazel: last_green
+    # TODO: Move back to last_green once rules_cc is fixed
+    bazel: 48555196ef92f54d0a331a01dac9db0a6aabc8b4
     platform: ubuntu2004
     test_targets:
     - "doc/..."

.bazelversion

@@ -1 +1 @@
-rolling
+5409637c4e2d5c010b7264172b1004a2afd46bfe

apple/internal/xctrunner.bzl

@@ -113,6 +113,7 @@ def _xctrunner_impl(ctx):
     args = ctx.actions.args()
     args.add("--name", ctx.attr.name)
     args.add("--platform", PLATFORM_MAP[platform])
+    args.add("--xcode-version", xcode_config.xcode_version())
     if ctx.attr.verbose:
         args.add("--verbose", ctx.attr.verbose)
 

apple/repositories.bzl

@@ -146,5 +146,12 @@ def apple_rules_dependencies(ignore_version_differences = False, include_bzlmod_
         ],
         strip_prefix = "xctestrunner-8710f141dfb0a3efe2744f865f914783259c24b0",
         sha256 = "34d3b9bcb3dcb5b2a0bf2cd4be58c03f6a0f0eb4329f87cd758461aeb00e9326",
+        patch_args = ["-p1"],
+        patches = [
+            # https://github.com/google/xctestrunner/pull/76
+            "//tools/patches:xctestrunner_loads.patch",
+            # https://github.com/google/xctestrunner/pull/71
+            "//tools/patches:xctestrunner_framework.patch",
+        ],
         ignore_version_differences = ignore_version_differences,
     )

test/starlark_tests/docc_tests.bzl

@@ -40,7 +40,7 @@ def docc_test_suite(name):
         text_test_file = "$BUNDLE_ROOT/metadata.json",
         text_test_values = [
             "\"bundleDisplayName\":\"app_with_swift_dep\"",
-            "\"bundleIdentifier\":\"com.google.example\"",
+            "\"bundleID\":\"com.google.example\"",
             "\"major\":0",
             "\"minor\":1",
             "\"patch\":0",
@@ -60,7 +60,7 @@ def docc_test_suite(name):
         text_test_file = "$BUNDLE_ROOT/metadata.json",
         text_test_values = [
             "\"bundleDisplayName\":\"BasicFramework\"",
-            "\"bundleIdentifier\":\"com.google.example.framework\"",
+            "\"bundleID\":\"com.google.example.framework\"",
             "\"major\":0",
             "\"minor\":1",
             "\"patch\":0",
@@ -80,7 +80,7 @@ def docc_test_suite(name):
         text_test_file = "$BUNDLE_ROOT/metadata.json",
         text_test_values = [
             "\"bundleDisplayName\":\"BasicLib\"",
-            "\"bundleIdentifier\":\"com.google.example.objc.lib\"",
+            "\"bundleID\":\"com.google.example.objc.lib\"",
             "\"major\":0",
             "\"minor\":1",
             "\"patch\":0",

tools/patches/BUILD

@@ -0,0 +1,28 @@
+diff --git a/xctestrunner/test_runner/xctestrun.py b/xctestrunner/test_runner/xctestrun.py
+index e0f2ef5..4dbae1c 100644
+--- a/xctestrunner/test_runner/xctestrun.py
++++ b/xctestrunner/test_runner/xctestrun.py
+@@ -649,11 +649,18 @@ def _GenerateTestRootForXctest(self):
+             os.path.join(platform_path, _LIB_XCTEST_SWIFT_RELATIVE_PATH),
+             app_under_test_frameworks_dir, app_under_test_signing_identity)
+       if xcode_info_util.GetXcodeVersionNumber() >= 1300:
+-        _CopyAndSignFramework(
+-            os.path.join(
+-                platform_path, 'Developer/Library/PrivateFrameworks/'
+-                'XCUIAutomation.framework'),
+-            app_under_test_frameworks_dir, app_under_test_signing_identity)
++        if xcode_info_util.GetXcodeVersionNumber() >= 1640:
++          _CopyAndSignFramework(
++              os.path.join(
++                  platform_path, 'Developer/Library/Frameworks/'
++                  'XCUIAutomation.framework'),
++              app_under_test_frameworks_dir, app_under_test_signing_identity)
++        else:
++          _CopyAndSignFramework(
++              os.path.join(
++                  platform_path, 'Developer/Library/PrivateFrameworks/'
++                  'XCUIAutomation.framework'),
++              app_under_test_frameworks_dir, app_under_test_signing_identity)
+         _CopyAndSignFramework(
+             os.path.join(
+                 platform_path, 'Developer/Library/PrivateFrameworks/'

tools/patches/xctestrunner_framework.patch

@@ -0,0 +1,32 @@
+diff --git a/BUILD b/BUILD
+index e73145e..050376c 100644
+--- a/BUILD
++++ b/BUILD
+@@ -1,3 +1,5 @@
++load("@rules_python//python:defs.bzl", "py_binary", "py_library")
++
+ package(default_visibility = ["//visibility:public"])
+ 
+ py_library(
+@@ -15,7 +17,10 @@ py_library(
+ 
+ py_binary(
+     name = "ios_test_runner",
+-    srcs = ["__init__.py", "xctestrunner/__init__.py"] + glob(
++    srcs = [
++        "__init__.py",
++        "xctestrunner/__init__.py",
++    ] + glob(
+         ["xctestrunner/test_runner/*.py"],
+     ),
+     main = "xctestrunner/test_runner/ios_test_runner.py",
+diff --git a/MODULE.bazel b/MODULE.bazel
+index 0ed8806..258f0a4 100644
+--- a/MODULE.bazel
++++ b/MODULE.bazel
+@@ -3,3 +3,5 @@ module(
+     version = "0.2.15",
+     compatibility_level = 1,
+ )
++
++bazel_dep(name = "rules_python", version = "1.0.0")

tools/patches/xctestrunner_loads.patch

@@ -10,7 +10,6 @@
 from lib.shell import shell, cp_r
 from lib.model import Configuration
 from lib.lipo_util import LipoUtil
-from lib.dependencies import FRAMEWORK_DEPS, PRIVATE_FRAMEWORK_DEPS, DYLIB_DEPS
 
 
 class DefaultHelpParser(argparse.ArgumentParser):
@@ -22,6 +21,17 @@ def error(self, message):
         sys.exit(2)
 
 
+def _parse_xcode_version(version_str: str) -> int:
+    """Gets the version number of the given version string."""
+    parts = version_str.split('.')
+    version_number = int(parts[0]) * 100
+    if len(parts) > 1:
+        version_number += int(parts[1]) * 10
+    if len(parts) > 2:
+        version_number += int(parts[2])
+    return version_number
+
+
 def main(argv) -> None:
     "Script entrypoint."
     parser = DefaultHelpParser()
@@ -46,6 +56,11 @@ def main(argv) -> None:
         action="append",
         help="Path to xctest archive to bundle.",
     )
+    parser.add_argument(
+        "--xcode-version",
+        required=True,
+        help="Current Xcode version.",
+    )
     parser.add_argument(
         "--verbose",
         required=False,
@@ -142,8 +157,32 @@ def main(argv) -> None:
         plist["CFBundleIdentifier"] = config.xctrunner.bundle_identifier
         plistlib.dump(plist, open(config.xctrunner.info_plist_path, "wb"))
 
+
+    framework_deps = [
+        "XCTest.framework",
+        "Testing.framework",  # Xcode 16+
+    ]
+
+    private_framework_deps = [
+        "XCTAutomationSupport.framework",
+        "XCTestCore.framework",
+        "XCTestSupport.framework",
+        "XCUnit.framework",
+    ]
+
+    dylib_deps = [
+        "libXCTestBundleInject.dylib",
+        "libXCTestSwiftSupport.dylib",
+    ]
+
+    xcode_version_int = _parse_xcode_version(args.xcode_version)
+    if xcode_version_int >= 1640:
+        framework_deps.append("XCUIAutomation.framework")
+    else:
+        private_framework_deps.append("XCUIAutomation.framework")
+
     # Copy dependencies to the bundle and remove unwanted architectures
-    for framework in FRAMEWORK_DEPS:
+    for framework in framework_deps:
         log.info("Bundling fwk: %s", framework)
         fwk_path = f"{config.xcode.frameworks_dir}/{framework}"
 
@@ -162,7 +201,7 @@ def main(argv) -> None:
             bin_path, archs_to_keep
         )  # Strip architectures not in test bundles.
 
-    for framework in PRIVATE_FRAMEWORK_DEPS:
+    for framework in private_framework_deps:
         log.info("Bundling fwk: %s", framework)
         cp_r(
             f"{config.xcode.private_frameworks_dir}/{framework}",
@@ -172,7 +211,7 @@ def main(argv) -> None:
         bin_path = f"{config.xctrunner.path}/Frameworks/{framework}/{fwk_binary}"
         lipo.extract_or_thin(bin_path, archs_to_keep)
 
-    for dylib in DYLIB_DEPS:
+    for dylib in dylib_deps:
         log.info("Bundling dylib: %s", dylib)
         shutil.copy(
             f"{config.xcode.dylib_dir}/{dylib}",