Fix CI for Bazel HEAD

Required changes to fix Bazel @ HEAD

Signed-off-by: Luis Padron <heyluispadron@gmail.com>

Author: luispadron

.bazelversion

@@ -1 +1 @@
-8.0.0
+8.x

MODULE.bazel

@@ -34,7 +34,7 @@ use_repo(
 
 bazel_dep(
     name = "apple_support",
-    version = "1.11.1",
+    version = "1.21.0",
     dev_dependency = True,
     repo_name = "build_bazel_apple_support",
 )
@@ -58,7 +58,7 @@ bazel_dep(
 # Use newer versions of deps in development
 single_version_override(
     module_name = "apple_support",
-    version = "1.17.1",
+    version = "1.21.0",
 )
 
 single_version_override(

buildbuddy.yaml

@@ -23,7 +23,7 @@ x_templates:
         USE_BAZEL_VERSION: 8.x
     - &bazel_head
       env:
-        USE_BAZEL_VERSION: last_green
+        USE_BAZEL_VERSION: 4c2d91e762ab6e492853b021408129dd93fb5904 # TODO: Switch back to last_green once get_cpu has been removed
 
     - &normal_resources
       resource_requests: { memory: 6GB }
@@ -114,7 +114,7 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      # Not validate since Bazel 8 Bzlmod paths are different
+      # Not validate since Bazel 8+ Bzlmod paths are different
       - *generate_integration
       - *build_all
   - name: Integration Test - "examples/integration" - Bazel LTS
@@ -124,8 +124,7 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      # Not validate since Bazel 8 Bzlmod paths are different
-      - *generate_integration
+      - *validate_integration
       - *build_all
   - name: Integration Test - "examples/integration" - Bazel HEAD
     <<: *bazel_head
@@ -134,7 +133,10 @@ actions:
     <<: *normal_resources
     <<: *examples_integration_workspace
     bazel_commands:
-      - *validate_integration
+      # Not validate as Bazel HEAD has incompatible path changes to repo rules
+      # - "external/+_repo_rules+examples_command_line_external/",
+      # + "external/+new_local_repository+examples_command_line_external/
+      - *generate_integration
       - *build_all
 
   - name: Integration Test - "examples/rules_ios" - Bazel Previous LTS

examples/integration/MODULE.bazel

@@ -5,7 +5,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "apple_support",
-    version = "1.15.1",
+    version = "1.21.0",
     repo_name = "build_bazel_apple_support",
 )
 bazel_dep(
@@ -50,13 +50,18 @@ use_repo(
     "local_config_apple_cc_toolchains",
 )
 
-# TODO: Remove manual register once https://github.com/bazelbuild/rules_cc/commit/c8c38f8c710cbbf834283e4777916b68261b359c is released
-register_toolchains("@local_config_apple_cc_toolchains//:all")
-
 non_module_deps = use_extension(":repositories.bzl", "non_module_deps")
 use_repo(
     non_module_deps,
     "FXPageControl",
     "com_github_krzyzanowskim_cryptoswift",
     "com_google_google_maps",
 )
+
+new_local_repository = use_repo_rule("@bazel_tools//tools/build_defs/repo:local.bzl", "new_local_repository")
+
+new_local_repository(
+    name = "examples_command_line_external",
+    build_file = "//CommandLine/external:BUILD.tpl",
+    path = "CommandLine/external",
+)

examples/integration/WORKSPACE.bzlmod

@@ -1,5 +0,0 @@
-new_local_repository(
-    name = "examples_command_line_external",
-    build_file = "//CommandLine/external:BUILD.tpl",
-    path = "CommandLine/external",
-)

examples/integration/iOSApp/Source/BUILD

@@ -44,7 +44,6 @@ ios_application(
         ":release_build": [],
         "//conditions:default": [
             "--digest-algorithm=sha1",
-            "--resource-rules=$(RESOURCE_RULES)",
         ],
     }),
     entitlements = "ios app.entitlements",

examples/rules_ios/MODULE.bazel

@@ -5,7 +5,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "apple_support",
-    version = "1.15.1",
+    version = "1.21.0",
     repo_name = "build_bazel_apple_support",
 )
 bazel_dep(
@@ -33,6 +33,3 @@ use_repo(
     "local_config_apple_cc",
     "local_config_apple_cc_toolchains",
 )
-
-# TODO: Remove manual register once https://github.com/bazelbuild/rules_cc/commit/c8c38f8c710cbbf834283e4777916b68261b359c is released
-register_toolchains("@local_config_apple_cc_toolchains//:all")

test/update_all_fixtures.sh

@@ -10,17 +10,13 @@ for dir in examples/*/ ; do
       continue
     fi
 
+    # rules_ios only supports up-to Bazel 7
     if [[ "$dir" == "examples/rules_ios/" ]]; then
-      bazel_version="7.4.1"
-    else
-      # See https://github.com/MobileNativeFoundation/rules_xcodeproj/pull/3029
-      #
-      # Temporary change to make CI pass until the fix is in `last_green`
-      bazel_version="dd2464a5933e0a5a6765024573832717b71989bf"
+      export USE_BAZEL_VERSION="7.x"
     fi
 
     echo
     echo "Updating \"${dir%/}\" fixtures"
     echo
-    USE_BAZEL_VERSION="$bazel_version" bazel run --config=cache //test/fixtures:update
+    bazel run --config=cache //test/fixtures:update
 done