Respect --output_base set on command-line (#1917)

Signed-off-by: Brentley Jones <[email protected]>

Author: brentleyjones

buildbuddy.yaml

@@ -47,12 +47,12 @@ x_templates:
 
   commands:
     - &set_release_archive_override "--output_base=setup-bazel-output-base run --config=workflows @rules_xcodeproj//tools:set_release_archive_override"
-    - &validate_integration "run --config=workflows --config=fixtures //test/fixtures:validate"
-    - &build_all "build --config=workflows --noexperimental_enable_bzlmod //..."
-    - &test_all "test --config=workflows --noexperimental_enable_bzlmod //..."
-    - &bzlmod_generate_integration "run --config=workflows --config=fixtures //test/fixtures:update"
-    - &bzlmod_build_all "build --config=workflows //..."
-    - &bzlmod_test_all "test --config=workflows //test/..."
+    - &validate_integration "--output_base=bazel-output-base run --config=workflows --config=fixtures //test/fixtures:validate"
+    - &build_all "--output_base=bazel-output-base build --config=workflows --noexperimental_enable_bzlmod //..."
+    - &test_all "--output_base=bazel-output-base test --config=workflows --noexperimental_enable_bzlmod //..."
+    - &bzlmod_generate_integration "--output_base=bazel-output-base run --config=workflows --config=fixtures //test/fixtures:update"
+    - &bzlmod_build_all "--output_base=bazel-output-base build --config=workflows //..."
+    - &bzlmod_test_all "--output_base=bazel-output-base test --config=workflows //test/..."
 
 actions:
   - name: Buildifier Lint

xcodeproj/internal/runner.template.sh

@@ -18,6 +18,7 @@ fail() {
 
 # Process Args
 
+readonly execution_root_file="$PWD/%execution_root_file%"
 readonly extra_flags_bazelrc="$PWD/%extra_flags_bazelrc%"
 readonly generator_build_file="$PWD/%generator_build_file%"
 readonly generator_defs_bzl="$PWD/%generator_defs_bzl%"
@@ -101,11 +102,7 @@ fi
 
 installer_flags+=(--bazel_path "$bazel_path")
 
-if [[ %is_fixture% -eq 1 ]]; then
-  execution_root=$("$bazel_path" info --config=fixtures execution_root)
-else
-  execution_root=$("$bazel_path" info execution_root)
-fi
+execution_root=$(<"$execution_root_file")
 installer_flags+=(--execution_root "$execution_root")
 
 readonly output_base="${execution_root%/*/*}"

xcodeproj/internal/xcodeproj_runner.bzl

@@ -109,6 +109,31 @@ def _write_extra_flags_bazelrc(name, actions, attr, config):
 
     return output
 
+def _write_execution_root_file(*, ctx):
+    output = ctx.actions.declare_file("{}_execution_root_file".format(ctx.attr.name))
+
+    ctx.actions.run_shell(
+        outputs = [output],
+        command = """\
+bin_dir_full_path="$(perl -MCwd -e 'print Cwd::abs_path shift' "{bin_dir_full}";)"
+execution_root="${{bin_dir_full_path%/{bin_dir_full}}}"
+
+echo "$execution_root" > "{out_full}"
+""".format(
+            bin_dir_full = ctx.bin_dir.path,
+            out_full = output.path,
+        ),
+        mnemonic = "CalculateXcodeProjExecutionRoot",
+        # This has to run locally
+        execution_requirements = {
+            "local": "1",
+            "no-remote": "1",
+            "no-sandbox": "1",
+        },
+    )
+
+    return output
+
 def _write_schemes_json(*, actions, name, schemes_json):
     output = actions.declare_file(
         "{}-custom_xcode_schemes.json".format(name),
@@ -267,6 +292,7 @@ def _write_runner(
         actions,
         bazel_path,
         config,
+        execution_root_file,
         extra_flags_bazelrc,
         extra_generator_flags,
         generator_build_file,
@@ -289,6 +315,7 @@ def _write_runner(
         substitutions = {
             "%bazel_path%": bazel_path,
             "%config%": config,
+            "%execution_root_file%": execution_root_file.short_path,
             "%extra_flags_bazelrc%": extra_flags_bazelrc.short_path,
             "%extra_generator_flags%": extra_generator_flags,
             "%generator_label%": (
@@ -336,6 +363,7 @@ def _xcodeproj_runner_impl(ctx):
         config = config,
         name = name,
     )
+    execution_root_file = _write_execution_root_file(ctx = ctx)
     schemes_json = _write_schemes_json(
         actions = actions,
         name = name,
@@ -363,6 +391,7 @@ def _xcodeproj_runner_impl(ctx):
         actions = actions,
         bazel_path = ctx.attr.bazel_path,
         config = config,
+        execution_root_file = execution_root_file,
         extra_flags_bazelrc = extra_flags_bazelrc,
         extra_generator_flags = (
             ctx.attr._extra_generator_flags[BuildSettingInfo].value
@@ -383,6 +412,7 @@ def _xcodeproj_runner_impl(ctx):
             executable = runner,
             runfiles = ctx.runfiles(
                 files = [
+                    execution_root_file,
                     extra_flags_bazelrc,
                     generator_build_file,
                     generator_defs_bzl,