Use release archive for examples (#2614)

This gives us quicker feedback on if the release archive works. It also
removes the need for a separate CI job.

---------

Signed-off-by: Brentley Jones <github@brentleyjones.com>

Author: brentleyjones

CODEOWNERS

@@ -6,7 +6,7 @@
 /.bcr/ @MobileNativeFoundation/rules_xcodeproj-maintainers-release
 /distribution/ @MobileNativeFoundation/rules_xcodeproj-maintainers-release
 /MODULE.bazel @MobileNativeFoundation/rules_xcodeproj-maintainers-release
-/tools/bazel @MobileNativeFoundation/rules_xcodeproj-maintainers-release
+tools/bazel @MobileNativeFoundation/rules_xcodeproj-maintainers-release
 /xcodeproj/repositories.bzl @MobileNativeFoundation/rules_xcodeproj-maintainers-release
 
 # Admin

buildbuddy.yaml

@@ -46,7 +46,6 @@ x_templates:
         - examples/sanitizers/setup-bazel-output-base
 
   commands:
-    - &set_release_archive_override "--output_base=setup-bazel-output-base run --config=workflows @rules_xcodeproj//tools:set_release_archive_override"
     - &validate_integration "--output_base=bazel-output-base run --config=workflows //test/fixtures:validate"
     - &build_all "--output_base=bazel-output-base build --config=workflows //..."
     - &test_all "--output_base=bazel-output-base test --config=workflows //test/..."
@@ -149,13 +148,3 @@ actions:
   #   bazel_commands:
   #     - *validate_integration
   #     - *build_all
-
-  - name: Validate release.tar.gz
-    <<: *bazel_in_repo_version
-    <<: *arm64
-    <<: *normal_resources
-    <<: *action_base
-    <<: *examples_integration_workspace
-    bazel_commands:
-      - *set_release_archive_override
-      - run --config=workflows //:xcodeproj-bazel-sim_arm64

distribution/BUILD

@@ -54,3 +54,23 @@ pkg_tar(
     strip_prefix = "/",
     tags = ["manual"],
 )
+
+genrule(
+    name = "expanded_release_pkg",
+    srcs = [":release_pkg"],
+    outs = ["expanded_release"],
+    cmd = """\
+set -euo pipefail
+
+mkdir "$@"
+tar -xf $< -C "$@"
+touch "$@/WORKSPACE"
+    """,
+    tags = ["manual"],
+)
+
+opt_wrapper(
+    name = "opt_expanded_release_pkg",
+    dep = ":expanded_release_pkg",
+    tags = ["manual"],
+)

examples/integration/MODULE.bazel

@@ -1,5 +1,6 @@
 bazel_dep(
     name = "rules_xcodeproj",
+    # Set to the real version with `--override_module`
     version = "0.0.0",
 )
 bazel_dep(
@@ -33,11 +34,6 @@ bazel_dep(
 
 bazel_dep(name = "bazel_features", version = "1.0.0", dev_dependency = True)
 
-local_path_override(
-    module_name = "rules_xcodeproj",
-    path = "../..",
-)
-
 local_path_override(
     module_name = "examples_cc_external",
     path = "cc/external",

examples/integration/tools/bazel

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+set -euo pipefail
+
+readonly tool_location="${BASH_SOURCE[0]}"
+readonly workspace_dir="${tool_location%/*/*}"
+readonly root_dir="${workspace_dir%/*/*}"
+readonly archive_output_base="$workspace_dir/bazel-output-base/release_archive"
+readonly override_bazelrc="$archive_output_base/override.bazelrc"
+
+# Don't update the release archive if doing a build inside of Xcode, or if we
+# are in the inner-bazel invocation
+if [[ -z "${BUILD_WORKSPACE_DIRECTORY:-}" ]]; then
+  # Update release archive
+
+  echo "Building expanded release.tar.gz" >&2
+  pushd "$root_dir" > /dev/null
+
+  # Ensure that we use bazelisk with `.bazelversion`, not whatever is being used
+  # in the currenct command
+  ppid=$(ps -o ppid= $$)
+  bazelisk=$(ps -ewwo comm= "${ppid// /}")
+  global_bazel=$(env PATH=/opt/homebrew/bin:/usr/local/bin /usr/bin/which "$bazelisk")
+  readonly root_bazel=(
+    env
+      BAZEL_REAL=
+      BAZELISK_SKIP_WRAPPER=
+      USE_BAZEL_VERSION=
+      PATH=/bin:/usr/bin
+      "$global_bazel"
+  )
+
+  "${root_bazel[@]}" \
+    "--output_base=$archive_output_base" \
+    build \
+    //distribution:opt_expanded_release_pkg
+
+  if [[ $(uname -m) == "arm64" ]]; then
+    repository_override="$archive_output_base/execroot/_main/bazel-out/darwin_arm64-opt/bin/distribution/expanded_release"
+  else
+    repository_override="$archive_output_base/execroot/_main/bazel-out/darwin-opt/bin/distribution/expanded_release"
+  fi
+  cat > "$override_bazelrc" <<EOF
+common --override_repository=rules_xcodeproj=$repository_override
+common --override_module=rules_xcodeproj=$repository_override
+EOF
+
+  popd > /dev/null
+
+  # Execute command
+
+  echo
+  echo "Executing bazel command" >&2
+fi
+
+
+bazel_version=$("$BAZEL_REAL" info release | /usr/bin/cut -d ' ' -f 2 | /usr/bin/cut -d '.' -f 1)
+if [[ "$bazel_version" == "version" ]]; then
+  bazel_version=7
+fi
+
+flags=("--noworkspace_rc")
+
+readonly root_version_bazelrc="$root_dir/bazel_$bazel_version.bazelrc"
+if [[ -s "$root_version_bazelrc" ]]; then
+  flags+=("--bazelrc=$root_version_bazelrc")
+fi
+
+readonly workspace_version_bazelrc="$workspace_dir/bazel_$bazel_version.bazelrc"
+if [[ -s "$workspace_version_bazelrc" ]]; then
+  flags+=("--bazelrc=$workspace_version_bazelrc")
+fi
+
+readonly workspace_bazelrc="$workspace_dir/.bazelrc"
+if [[ -s "$workspace_bazelrc" ]]; then
+  flags+=("--bazelrc=$workspace_bazelrc")
+fi
+
+flags+=("--bazelrc=$override_bazelrc")
+
+exec "$BAZEL_REAL" "${flags[@]}" "$@"

examples/integration/tools/bazel

@@ -1 +1 @@
-../../../tools/bazel
+../../integration/tools/bazel

examples/rules_ios/tools/bazel

@@ -1 +1 @@
-../../../tools/bazel
+../../integration/tools/bazel

examples/sanitizers/tools/bazel

@@ -1,6 +1,8 @@
 # Opt into future migrations
 build --experimental_strict_conflict_checks
 build --incompatible_disallow_empty_glob
+
+# Don't create convenience symlinks
 build --experimental_convenience_symlinks=ignore
 
 # Use Bzlmod

shared.bazelrc

@@ -285,12 +285,6 @@ xcodeproj(
 
 # Release
 
-sh_binary(
-    name = "set_release_archive_override",
-    srcs = ["set_release_archive_override.sh"],
-    tags = ["manual"],
-)
-
 filegroup(
     name = "release_files",
     srcs = [