@invarn/cibuild 2.8.3 → 2.8.5

package/dist/src/yaml/steps/android-variant-resolution.test.js

@@ -15,7 +15,11 @@
  * not re-implemented.
  */
 import { execFileSync } from "node:child_process";
-import { PICK_VARIANT_TASK_FUNCTION, variantTaskCommands } from "./android.js";
+import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { AndroidBuildForUITestingStepExecutor, AndroidLintStepExecutor, AndroidUnitTestStepExecutor, GradleBuildStepExecutor, PICK_VARIANT_TASK_FUNCTION, gradleProjectDir, gradleTaskPath, variantTaskCommands, } from "./android.js";
+import { testConfig } from "./test-config.js";
 /** Run the shipped shell function over some Gradle output. */
 function pick(gradleOutput, prefix, suffix, buildType) {
     const script = `${PICK_VARIANT_TASK_FUNCTION}\ncibuild_pick_variant_task "${prefix}" "${suffix}" "${buildType}"`;
@@ -114,4 +118,143 @@ describe("the step that uses it", () => {
         expect(script).toContain('exit "$VARIANT_STATUS"');
     });
 });
+/**
+ * An app whose root project is the application: no `include`, the Android
+ * application plugin applied in the root build file, sources in `src/`.
+ * Gradle's path for that project is `:`, so a pipeline says `module: ":"`.
+ */
+describe("a module that names the root project", () => {
+    const escape = (value) => value;
+    test("runs the root project's own task, with no empty module segment", () => {
+        const script = variantTaskCommands({
+            module: ":",
+            variant: "debug",
+            prefix: "test",
+            suffix: "UnitTest",
+            escape,
+        }).join("\n");
+        expect(script).toContain("$GRADLE_CMD :testDebugUnitTest");
+        expect(script).not.toContain("::");
+    });
+    test("retries the resolved task on the root project too", () => {
+        const script = variantTaskCommands({
+            module: ":",
+            variant: "debug",
+            prefix: "lint",
+            suffix: "",
+            escape,
+        }).join("\n");
+        expect(script).toContain("$GRADLE_CMD :lintDebug");
+        expect(script).toContain("$GRADLE_CMD :$RESOLVED_TASK");
+        expect(script).toContain('echo "Using :$RESOLVED_TASK');
+        expect(script).not.toContain("::");
+    });
+    // An explicit empty string reaches the step as is; it must not become
+    // `::testDebugUnitTest`.
+    test("treats an empty module as the root", () => {
+        const script = variantTaskCommands({
+            module: "",
+            variant: "debug",
+            prefix: "test",
+            suffix: "UnitTest",
+            escape,
+        }).join("\n");
+        expect(script).toContain("$GRADLE_CMD :testDebugUnitTest");
+        expect(script).not.toContain("::");
+    });
+    test("leaves a named module exactly as it was", () => {
+        const options = { variant: "debug", prefix: "test", suffix: "UnitTest", escape };
+        const script = variantTaskCommands({ module: "app", ...options }).join("\n");
+        expect(script).toContain("$GRADLE_CMD :app:testDebugUnitTest 2>&1");
+        expect(script).toContain("  echo \"Using :app:$RESOLVED_TASK — resolved VARIANT=$RESOLVED_VARIANT\"");
+        expect(script).toContain("  $GRADLE_CMD :app:$RESOLVED_TASK");
+    });
+    test("keeps a nested module's path", () => {
+        const script = variantTaskCommands({
+            module: "feature:store",
+            variant: "debug",
+            prefix: "lint",
+            suffix: "",
+            escape,
+        }).join("\n");
+        expect(script).toContain("$GRADLE_CMD :feature:store:lintDebug");
+    });
+});
+describe("gradleTaskPath and gradleProjectDir", () => {
+    test("compose a task path", () => {
+        expect(gradleTaskPath(":", "lintDebug")).toBe(":lintDebug");
+        expect(gradleTaskPath("", "lintDebug")).toBe(":lintDebug");
+        expect(gradleTaskPath("app", "lintDebug")).toBe(":app:lintDebug");
+    });
+    test("compose the project directory, empty for the root", () => {
+        expect(gradleProjectDir(":")).toBe("");
+        expect(gradleProjectDir("")).toBe("");
+        expect(gradleProjectDir("app")).toBe("app/");
+    });
+});
+describe("the steps, for the root project", () => {
+    test("lint runs :lintDebug and reports under build/", async () => {
+        const result = await new AndroidLintStepExecutor().execute({ module: ":" }, {}, testConfig);
+        const script = result.script;
+        expect(script).toContain("$GRADLE_CMD :lintDebug");
+        expect(script).not.toContain("::");
+        expect(script).toContain('echo "Lint report location: build/reports/lint-results-debug.html"');
+        expect(script).toContain('echo "Running lint on the root project"');
+    });
+    test("unit tests run :testDebugUnitTest and report under build/", async () => {
+        const result = await new AndroidUnitTestStepExecutor().execute({ module: ":" }, {}, testConfig);
+        const script = result.script;
+        expect(script).toContain("$GRADLE_CMD :testDebugUnitTest");
+        expect(script).not.toContain("::");
+        expect(script).toContain('echo "Test report location: build/reports/tests/testDebugUnitTest/index.html"');
+    });
+    test("an absent module still means app", async () => {
+        const lint = await new AndroidLintStepExecutor().execute({}, {}, testConfig);
+        const unit = await new AndroidUnitTestStepExecutor().execute({}, {}, testConfig);
+        expect(lint.script).toContain("$GRADLE_CMD :app:lintDebug");
+        expect(lint.script).toContain('echo "Running lint on module: app"');
+        expect(unit.script).toContain('echo "Running unit tests on module: app"');
+        expect(lint.script).toContain('echo "Lint report location: app/build/reports/lint-results-debug.html"');
+        expect(unit.script).toContain("$GRADLE_CMD :app:testDebugUnitTest");
+    });
+    test("UI testing assembles on the root and finds its APKs", async () => {
+        const result = await new AndroidBuildForUITestingStepExecutor().execute({ module: ":" }, {}, testConfig);
+        const script = result.script;
+        expect(script).toContain("$GRADLE_CMD :assembleDebug :assembleDebugAndroidTest");
+        expect(script).not.toContain("::");
+        const find = script.split("\n").find((l) => l.startsWith("APP_APK="));
+        const pattern = find.match(/-path "([^"]+)"/)[1];
+        const dir = mkdtempSync(join(tmpdir(), "cibuild-root-apk-"));
+        try {
+            mkdirSync(join(dir, "build/outputs/apk/debug"), { recursive: true });
+            writeFileSync(join(dir, "build/outputs/apk/debug/x.apk"), "");
+            const found = execFileSync("find", [".", "-path", pattern], { cwd: dir, encoding: "utf-8" }).trim();
+            expect(found).toBe("./build/outputs/apk/debug/x.apk");
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+});
+/**
+ * gradle-build takes a bare `assembleDebug`, which a root project satisfies.
+ * Its artifact collection must still see `./build/outputs/...`.
+ */
+describe("gradle-build's artifact collection", () => {
+    test("finds an APK the root project wrote", async () => {
+        const result = await new GradleBuildStepExecutor().execute({}, {}, testConfig);
+        const script = result.script;
+        const pattern = script.match(/-path "(\*\/build\/outputs\/apk\/[^"]+)"/)[1];
+        const dir = mkdtempSync(join(tmpdir(), "cibuild-root-apk-"));
+        try {
+            mkdirSync(join(dir, "build/outputs/apk/debug"), { recursive: true });
+            writeFileSync(join(dir, "build/outputs/apk/debug/x.apk"), "");
+            const found = execFileSync("find", [".", "-path", pattern], { cwd: dir, encoding: "utf-8" }).trim();
+            expect(found).toBe("./build/outputs/apk/debug/x.apk");
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+});
 //# sourceMappingURL=android-variant-resolution.test.js.map

package/dist/src/yaml/steps/android.d.ts

@@ -85,6 +85,14 @@ export declare class GradleBuildStepExecutor extends BaseStepExecutor {
  * Written as a shell function so what ships is what the test runs.
  */
 export declare const PICK_VARIANT_TASK_FUNCTION = "cibuild_pick_variant_task() {\n  # $1 task prefix (lint, test), $2 task suffix (empty, UnitTest),\n  # $3 the build type to prefer (Debug). Gradle's output arrives on stdin.\n  awk '/Candidates are:/ { sub(/.*Candidates are:/, \"\"); print; exit }' |\n    tr ',' '\\n' |\n    tr -d \" '\\\".\" |\n    grep -E \"^${1}[A-Za-z0-9]*${3}${2}$\" |\n    head -1\n}";
+/**
+ * The Gradle path of a task in a module: `:app:lintDebug`, or `:lintDebug`
+ * for an app whose root project is the application. The leading `:` keeps it
+ * the root project's own task rather than every project's task of that name.
+ */
+export declare function gradleTaskPath(module: string, task: string): string;
+/** A module's directory with a trailing slash, or `''` for the root project. */
+export declare function gradleProjectDir(module: string): string;
 /**
  * The commands that run a variant-specific Gradle task and, if the variant
  * turns out to be a guess Gradle cannot resolve, resolve it and retry once.

package/dist/src/yaml/steps/android.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/android.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"android.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/android.ts"],"names":[],"mappings":"AAAA;;GAEG;AAUH,OAAO,EAAE,gBAAgB,EAAuB,MAAM,WAAW,CAAC;AAClE,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CAChC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;GAEG;AACH,MAAM,WAAW,qBAAqB;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED;;;GAGG;AACH,qBAAa,0BAA2B,SAAQ,gBAAgB;IAC9D,yBAAyB,CACvB,MAAM,EAAE,oBAAoB,EAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAyB1B;;;OAGG;YACW,4BAA4B;IAwF1C,UAAU,IAAI,UAAU,EAAE;IAUpB,OAAO,CAAC,MAAM,EAAE,oBAAoB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CA6H7G;AAED;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D,UAAU,IAAI,UAAU,EAAE;IAe1B,yBAAyB,CACvB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAiBpB,OAAO,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CA8P1G;AAED;;;GAGG;AACH;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,0BAA0B,0WAQrC,CAAC;AAYH;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,gFAAgF;AAChF,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvD;AAOD;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,wDAAwD;IACxD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;CACnC,GAAG,MAAM,EAAE,CAuCX;AAED,qBAAa,uBAAwB,SAAQ,gBAAgB;IAC3D,yBAAyB,CACvB,OAAO,EAAE,iBAAiB,EAC1B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAiBpB,OAAO,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CA6L1G;AAED;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,gBAAgB;IAC/D,yBAAyB,CACvB,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAiBpB,OAAO,CAAC,MAAM,EAAE,qBAAqB,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CAwM9G;AAMD,MAAM,WAAW,8BAA8B;IAC7C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,qBAAa,oCAAqC,SAAQ,gBAAgB;IACxE,yBAAyB,CACvB,OAAO,EAAE,8BAA8B,EACvC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAM1B,UAAU,IAAI,UAAU,EAAE;IAOpB,OAAO,CAAC,MAAM,EAAE,8BAA8B,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;CAsEzH"}

package/dist/src/yaml/steps/android.js

@@ -544,6 +544,31 @@ export const PICK_VARIANT_TASK_FUNCTION = `cibuild_pick_variant_task() {
     grep -E "^\${1}[A-Za-z0-9]*\${3}\${2}$" |
     head -1
 }`;
+/**
+ * Whether a `module` input names the root project. Gradle's own path for the
+ * root is `:`; an explicit empty string is taken to mean the same, since it
+ * would otherwise compose `::<task>`. An absent input never reaches here —
+ * the steps default it to `app`.
+ */
+function isRootProject(module) {
+    return module === ':' || module === '';
+}
+/**
+ * The Gradle path of a task in a module: `:app:lintDebug`, or `:lintDebug`
+ * for an app whose root project is the application. The leading `:` keeps it
+ * the root project's own task rather than every project's task of that name.
+ */
+export function gradleTaskPath(module, task) {
+    return isRootProject(module) ? `:${task}` : `:${module}:${task}`;
+}
+/** A module's directory with a trailing slash, or `''` for the root project. */
+export function gradleProjectDir(module) {
+    return isRootProject(module) ? '' : `${module}/`;
+}
+/** How a log line names the project a step runs on. */
+function gradleProjectLabel(module) {
+    return isRootProject(module) ? 'the root project' : `module: ${module}`;
+}
 /**
  * The commands that run a variant-specific Gradle task and, if the variant
  * turns out to be a guess Gradle cannot resolve, resolve it and retry once.
@@ -555,7 +580,7 @@ export const PICK_VARIANT_TASK_FUNCTION = `cibuild_pick_variant_task() {
 export function variantTaskCommands(options) {
     const { module, variant, prefix, suffix, gradleArgs = '', escape } = options;
     const capitalized = variant.charAt(0).toUpperCase() + variant.slice(1);
-    const task = `:${escape(module)}:${prefix}${capitalized}${suffix}`;
+    const task = gradleTaskPath(escape(module), `${prefix}${capitalized}${suffix}`);
     const args = gradleArgs === '' ? '' : ` ${gradleArgs}`;
     return [
         '',
@@ -580,10 +605,10 @@ export function variantTaskCommands(options) {
         `  RESOLVED_VARIANT=\${RESOLVED_TASK#${prefix}}`,
         ...(suffix === '' ? [] : [`  RESOLVED_VARIANT=\${RESOLVED_VARIANT%${suffix}}`]),
         `  RESOLVED_VARIANT="$(echo "\${RESOLVED_VARIANT:0:1}" | tr '[:upper:]' '[:lower:]')\${RESOLVED_VARIANT:1}"`,
-        `  echo "Using :${escape(module)}:$RESOLVED_TASK — resolved VARIANT=$RESOLVED_VARIANT"`,
+        `  echo "Using ${gradleTaskPath(escape(module), '$RESOLVED_TASK')} — resolved VARIANT=$RESOLVED_VARIANT"`,
         // Best-effort: the discovery is worth having even where envman is not.
         '  envman add --key VARIANT --value "$RESOLVED_VARIANT" || true',
-        `  $GRADLE_CMD :${escape(module)}:$RESOLVED_TASK${args}`,
+        `  $GRADLE_CMD ${gradleTaskPath(escape(module), '$RESOLVED_TASK')}${args}`,
         'elif [ "$VARIANT_STATUS" -ne 0 ]; then',
         '  rm -f "$VARIANT_LOG"',
         '  exit "$VARIANT_STATUS"',
@@ -736,7 +761,7 @@ export class AndroidLintStepExecutor extends BaseStepExecutor {
             commands.push('PROJECT_DIR="${CIBUILD_SOURCE_DIR:-.}"');
         }
         commands.push('echo "Project directory: $PROJECT_DIR"');
-        commands.push(`echo "Running lint on module: ${this.escapeBash(module)}"`);
+        commands.push(`echo "Running lint on ${gradleProjectLabel(this.escapeBash(module))}"`);
         commands.push(`echo "Variant: ${this.escapeBash(variant)}"`);
         // Change to project directory
         commands.push('');
@@ -769,7 +794,7 @@ export class AndroidLintStepExecutor extends BaseStepExecutor {
         commands.push('');
         commands.push('# Lint completed');
         commands.push('echo "Lint analysis completed successfully"');
-        commands.push(`echo "Lint report location: ${this.escapeBash(module)}/build/reports/lint-results-${this.escapeBash(variant)}.html"`);
+        commands.push(`echo "Lint report location: ${gradleProjectDir(this.escapeBash(module))}build/reports/lint-results-${this.escapeBash(variant)}.html"`);
         const script = this.createBashScriptFromCommands(commands, stepName);
         return this.createScriptStep(script, stepName);
     }
@@ -925,7 +950,7 @@ export class AndroidUnitTestStepExecutor extends BaseStepExecutor {
             commands.push('PROJECT_DIR="${CIBUILD_SOURCE_DIR:-.}"');
         }
         commands.push('echo "Project directory: $PROJECT_DIR"');
-        commands.push(`echo "Running unit tests on module: ${this.escapeBash(module)}"`);
+        commands.push(`echo "Running unit tests on ${gradleProjectLabel(this.escapeBash(module))}"`);
         commands.push(`echo "Variant: ${this.escapeBash(variant)}"`);
         // Change to project directory
         commands.push('');
@@ -964,7 +989,7 @@ export class AndroidUnitTestStepExecutor extends BaseStepExecutor {
         commands.push('');
         commands.push('# Tests completed');
         commands.push('echo "Unit tests completed successfully"');
-        commands.push(`echo "Test report location: ${this.escapeBash(module)}/build/reports/tests/test${variantCapitalized}UnitTest/index.html"`);
+        commands.push(`echo "Test report location: ${gradleProjectDir(this.escapeBash(module))}build/reports/tests/test${variantCapitalized}UnitTest/index.html"`);
         const script = this.createBashScriptFromCommands(commands, stepName);
         return this.createScriptStep(script, stepName);
     }
@@ -1013,8 +1038,8 @@ export class AndroidBuildForUITestingStepExecutor extends BaseStepExecutor {
         commands.push('fi');
         commands.push('');
         // Build both app and test APKs
-        const appTask = `:${this.escapeBash(module)}:assemble${variantCap}`;
-        const testTask = `:${this.escapeBash(module)}:assemble${variantCap}AndroidTest`;
+        const appTask = gradleTaskPath(this.escapeBash(module), `assemble${variantCap}`);
+        const testTask = gradleTaskPath(this.escapeBash(module), `assemble${variantCap}AndroidTest`);
         let cmd = `$GRADLE_CMD ${appTask} ${testTask}`;
         if (extraArgs) {
             cmd += ` ${extraArgs}`;
@@ -1024,8 +1049,8 @@ export class AndroidBuildForUITestingStepExecutor extends BaseStepExecutor {
         commands.push('');
         // Locate APKs
         commands.push('# Locate generated APKs');
-        commands.push(`APP_APK=$(find . -path "*/${this.escapeBash(module)}/build/outputs/apk/*/*.apk" ! -name "*androidTest*" | head -1)`);
-        commands.push(`TEST_APK=$(find . -path "*/${this.escapeBash(module)}/build/outputs/apk/*/*.apk" -name "*androidTest*" | head -1)`);
+        commands.push(`APP_APK=$(find . -path "*/${gradleProjectDir(this.escapeBash(module))}build/outputs/apk/*/*.apk" ! -name "*androidTest*" | head -1)`);
+        commands.push(`TEST_APK=$(find . -path "*/${gradleProjectDir(this.escapeBash(module))}build/outputs/apk/*/*.apk" -name "*androidTest*" | head -1)`);
         commands.push('');
         commands.push('if [ -z "$APP_APK" ]; then');
         commands.push('  echo "⚠️  App APK not found"');

package/dist/src/yaml/steps/cocoapods-locked-bundler.test.d.ts

@@ -0,0 +1,17 @@
+/**
+ * A Gemfile.lock names the bundler that must run it, and the step has to run
+ * that one.
+ *
+ * `BUNDLED WITH 2.3.21` is routine. The step found `bundle` on PATH — on a mac
+ * guest that is /usr/bin/bundle, system Ruby 2.6 — and ran `bundle install`,
+ * and RubyGems refused to start any bundler but the locked one:
+ *
+ *   Could not find 'bundler' (2.3.21) required by your Gemfile.lock.
+ *   (Gem::GemNotFoundException)
+ *
+ * System Ruby cannot `gem install` without sudo either, so nothing in the step
+ * could recover. These tests run the generated script against stand-in `gem`,
+ * `bundle`, `pod` and `brew` executables and read back what it invoked.
+ */
+export {};
+//# sourceMappingURL=cocoapods-locked-bundler.test.d.ts.map

package/dist/src/yaml/steps/cocoapods-locked-bundler.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cocoapods-locked-bundler.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/cocoapods-locked-bundler.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG"}

package/dist/src/yaml/steps/cocoapods-locked-bundler.test.js

@@ -0,0 +1,145 @@
+/**
+ * A Gemfile.lock names the bundler that must run it, and the step has to run
+ * that one.
+ *
+ * `BUNDLED WITH 2.3.21` is routine. The step found `bundle` on PATH — on a mac
+ * guest that is /usr/bin/bundle, system Ruby 2.6 — and ran `bundle install`,
+ * and RubyGems refused to start any bundler but the locked one:
+ *
+ *   Could not find 'bundler' (2.3.21) required by your Gemfile.lock.
+ *   (Gem::GemNotFoundException)
+ *
+ * System Ruby cannot `gem install` without sudo either, so nothing in the step
+ * could recover. These tests run the generated script against stand-in `gem`,
+ * `bundle`, `pod` and `brew` executables and read back what it invoked.
+ */
+import { execFileSync } from 'node:child_process';
+import { chmodSync, mkdirSync, mkdtempSync, readFileSync, existsSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, test, expect } from '@jest/globals';
+import { CocoapodsInstallStepExecutor } from './ios-deps.js';
+import { testConfig } from './test-config.js';
+const LOCK_WITH_BUNDLER = `GEM
+  remote: https://rubygems.org/
+  specs:
+    cocoapods (1.15.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cocoapods
+
+BUNDLED WITH
+   2.3.21
+`;
+const executable = (path, body) => {
+    writeFileSync(path, `#!/bin/bash\n${body}\n`);
+    chmodSync(path, 0o755);
+};
+/**
+ * Runs the step in a fresh project directory. `installed` lists the bundler
+ * versions the stand-in `gem` reports as already present.
+ */
+const run = async (opts) => {
+    const root = mkdtempSync(join(tmpdir(), 'cibuild-bundler-'));
+    const project = join(root, 'repo');
+    const bin = join(root, 'bin');
+    const scratch = join(root, 'scratch');
+    const log = join(root, 'calls.log');
+    mkdirSync(project);
+    mkdirSync(bin);
+    mkdirSync(scratch);
+    writeFileSync(join(project, 'Podfile'), "platform :ios, '15.0'\n");
+    if (opts.lock !== undefined)
+        writeFileSync(join(project, 'Gemfile.lock'), opts.lock);
+    writeFileSync(join(project, 'Gemfile'), opts.gemfile ?? "gem 'cocoapods'\n");
+    const installed = (opts.installed ?? []).join(' ');
+    executable(join(bin, 'gem'), `echo "gem $*" >> '${log}'
+if [ "$1" = "list" ]; then
+  for v in ${installed}; do [ "$v" = "$5" ] && exit 0; done
+  exit 1
+fi
+if [ "$1" = "install" ]; then
+  ${opts.gemInstallFails ? 'exit 1' : 'mkdir -p "$GEM_HOME/bin"; cp "$(dirname "$0")/bundle" "$GEM_HOME/bin/bundle"; exit 0'}
+fi`);
+    executable(join(bin, 'bundle'), `echo "bundle $* (GEM_HOME=$GEM_HOME)" >> '${log}'`);
+    executable(join(bin, 'pod'), `echo "pod $*" >> '${log}'`);
+    executable(join(bin, 'ruby'), `echo "ruby $*" >> '${log}'; printf '2.6.10'`);
+    if (opts.brewRuby) {
+        const keg = join(root, 'homebrew-ruby');
+        mkdirSync(join(keg, 'bin'), { recursive: true });
+        executable(join(keg, 'bin', 'ruby'), `echo "brew-ruby $*" >> '${log}'; printf '3.4.1'`);
+        executable(join(bin, 'brew'), `if [ "$*" = "--prefix --installed ruby" ]; then echo '${keg}'; exit 0; fi; exit 1`);
+    }
+    const script = (await new CocoapodsInstallStepExecutor().execute({ source_root_path: project }, {}, testConfig)).script;
+    const scriptPath = join(root, 'step.sh');
+    writeFileSync(scriptPath, script);
+    let output = '';
+    try {
+        output = execFileSync('bash', [scriptPath], {
+            cwd: root,
+            env: { PATH: `${bin}:/usr/bin:/bin`, HOME: root, CIBUILD_SCRATCH: scratch },
+            stdio: 'pipe',
+        }).toString();
+    }
+    catch (err) {
+        output = `${err.stdout ?? ''}${err.stderr ?? ''}\nEXIT ${err.status}`;
+    }
+    const calls = existsSync(log) ? readFileSync(log, 'utf-8').trim().split('\n') : [];
+    return { calls, output, gemHome: join(scratch, 'cibuild-gems'), scratch };
+};
+describe('cocoapods-install runs the bundler Gemfile.lock names', () => {
+    test('installs the locked bundler when it is missing', async () => {
+        const { calls } = await run({ lock: LOCK_WITH_BUNDLER });
+        expect(calls).toContain('gem install bundler -v 2.3.21 --no-document');
+    });
+    test('installs it into a writable GEM_HOME outside the checkout', async () => {
+        const { calls, gemHome } = await run({ lock: LOCK_WITH_BUNDLER });
+        const install = calls.find((c) => c.startsWith('bundle _2.3.21_ install'));
+        expect(install).toBeDefined();
+        expect(install).toContain(`GEM_HOME=${gemHome}`);
+    });
+    test('runs install and pod through that exact version', async () => {
+        const { calls } = await run({ lock: LOCK_WITH_BUNDLER });
+        expect(calls.some((c) => c.startsWith('bundle _2.3.21_ install'))).toBe(true);
+        expect(calls.some((c) => c.startsWith('bundle _2.3.21_ exec pod install'))).toBe(true);
+        // Never an unversioned bundle, which is what RubyGems refused.
+        expect(calls.some((c) => /^bundle (install|exec)/.test(c))).toBe(false);
+    });
+    test('does not reinstall a bundler that is already there', async () => {
+        const { calls } = await run({ lock: LOCK_WITH_BUNDLER, installed: ['2.3.21'] });
+        expect(calls.some((c) => c.startsWith('gem install'))).toBe(false);
+        expect(calls.some((c) => c.startsWith('bundle _2.3.21_ exec pod install'))).toBe(true);
+    });
+    test('a lockfile without BUNDLED WITH keeps plain bundle', async () => {
+        const { calls } = await run({ lock: LOCK_WITH_BUNDLER.replace(/BUNDLED WITH\n.*\n/, '') });
+        expect(calls.some((c) => c.startsWith('gem install'))).toBe(false);
+        expect(calls.some((c) => c.startsWith('bundle exec pod install'))).toBe(true);
+    });
+    test('a Gemfile with no lock keeps plain bundle', async () => {
+        const { calls } = await run({});
+        expect(calls.some((c) => c.startsWith('bundle install'))).toBe(true);
+        expect(calls.some((c) => c.startsWith('bundle exec pod install'))).toBe(true);
+    });
+    test('a project without cocoapods in its Gemfile runs pod directly', async () => {
+        const { calls } = await run({ gemfile: "gem 'fastlane'\n" });
+        expect(calls).toContain('pod install');
+        expect(calls.some((c) => c.startsWith('bundle'))).toBe(false);
+    });
+    test('says which bundler it could not install, and fails', async () => {
+        const { output } = await run({ lock: LOCK_WITH_BUNDLER, gemInstallFails: true });
+        expect(output).toContain('bundler 2.3.21');
+        expect(output).toContain('BUNDLED WITH');
+        expect(output).toMatch(/EXIT [1-9]/);
+    });
+    // Homebrew's ruby is keg-only, so a guest whose CocoaPods and fastlane came
+    // from Homebrew has it installed and still resolves `ruby` to the system 2.6.
+    test('prefers an installed Homebrew Ruby over system Ruby', async () => {
+        const { calls } = await run({ lock: LOCK_WITH_BUNDLER, brewRuby: true });
+        expect(calls.some((c) => c.startsWith('brew-ruby'))).toBe(true);
+        expect(calls.some((c) => c.startsWith('ruby '))).toBe(false);
+    });
+});
+//# sourceMappingURL=cocoapods-locked-bundler.test.js.map

package/dist/src/yaml/steps/cocoapods-skip-if-absent.test.js

@@ -66,7 +66,7 @@ describe('skip_if_absent turns it into a clean no-op', () => {
     test('still chooses between bundle exec and bare pod', async () => {
         const script = await build({ skip_if_absent: true });
         expect(script).toContain('USE_BUNDLE_EXEC');
-        expect(script).toContain('bundle exec pod');
+        expect(script).toContain('$BUNDLE_CMD exec pod');
     });
 });
 /**

package/dist/src/yaml/steps/ios-deps.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ios-deps.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ios-deps.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAc,MAAM,wBAAwB,CAAC;AAMhF,MAAM,WAAW,sBAAsB;IACrC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;;;;;;;OAiBG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,gBAAgB;IAChE,yBAAyB,CACvB,OAAO,EAAE,sBAAsB,EAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CA+FpB;AAMD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;IACxD,yBAAyB,CACvB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAyDpB"}
+{"version":3,"file":"ios-deps.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/ios-deps.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EAAE,qBAAqB,EAAc,MAAM,wBAAwB,CAAC;AAMhF,MAAM,WAAW,sBAAsB;IACrC,0CAA0C;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4DAA4D;IAC5D,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;;;;;;;;;;;;OAiBG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,uCAAuC;IACvC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB;;;;;;;;;;;;;;OAcG;IACH,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;GAIG;AACH,qBAAa,4BAA6B,SAAQ,gBAAgB;IAChE,yBAAyB,CACvB,OAAO,EAAE,sBAAsB,EAC/B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,sBAAsB,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAoJpB;AAMD,MAAM,WAAW,cAAc;IAC7B,mDAAmD;IACnD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,kDAAkD;IAClD,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,6BAA6B;IAC7B,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,gBAAgB;IACxD,yBAAyB,CACvB,OAAO,EAAE,cAAc,EACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAUpB,OAAO,CACX,MAAM,EAAE,cAAc,EACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,OAAO,CAAC,OAAO,CAAC;CAyDpB"}

package/dist/src/yaml/steps/ios-deps.js

@@ -65,17 +65,69 @@ export class CocoapodsInstallStepExecutor extends BaseStepExecutor {
         commands.push('# Detect Gemfile with cocoapods gem → use bundle exec');
         commands.push('USE_BUNDLE_EXEC="false"');
         commands.push('if [ -f "Gemfile.lock" ] && grep -q "cocoapods" "Gemfile.lock" 2>/dev/null; then');
-        commands.push('  if command -v bundle &>/dev/null; then');
-        commands.push('    USE_BUNDLE_EXEC="true"');
-        commands.push('    echo "Detected cocoapods in Gemfile.lock — using bundle exec"');
-        commands.push('    bundle install --quiet');
-        commands.push('  fi');
+        commands.push('  USE_BUNDLE_EXEC="true"');
+        commands.push('  echo "Detected cocoapods in Gemfile.lock — using bundle exec"');
         commands.push('elif [ -f "Gemfile" ] && grep -q "cocoapods" "Gemfile" 2>/dev/null; then');
-        commands.push('  if command -v bundle &>/dev/null; then');
-        commands.push('    USE_BUNDLE_EXEC="true"');
-        commands.push('    echo "Detected cocoapods in Gemfile — using bundle exec"');
-        commands.push('    bundle install --quiet');
+        commands.push('  USE_BUNDLE_EXEC="true"');
+        commands.push('  echo "Detected cocoapods in Gemfile — using bundle exec"');
+        commands.push('fi');
+        commands.push('');
+        // Run the bundler the lockfile names, from a Ruby that can install it.
+        //
+        // A Gemfile.lock ends in `BUNDLED WITH <version>`, and RubyGems refuses to
+        // start any other bundler for it: "Could not find 'bundler' (2.3.21)
+        // required by your Gemfile.lock". The step used to run whatever `bundle`
+        // was on PATH, which on a mac guest is /usr/bin/bundle, system Ruby 2.6 —
+        // and system Ruby cannot `gem install` without sudo, so nothing in the step
+        // could recover.
+        //
+        // Three moves, each conditional, so a machine missing a piece keeps the
+        // old behaviour rather than failing on it:
+        //   - prefer an installed Homebrew Ruby. It is keg-only, so it is not on
+        //     PATH even where it is installed (Homebrew's cocoapods and fastlane
+        //     formulae depend on it), and the system 2.6 wins by default;
+        //   - point GEM_HOME at a writable directory outside the checkout, so both
+        //     `gem install bundler` and `bundle install` can write without sudo,
+        //     and put its bin directory first;
+        //   - install the locked bundler if it is absent and invoke it by version,
+        //     `bundle _<version>_`, which is the form RubyGems accepts.
+        commands.push('BUNDLE_CMD="bundle"');
+        commands.push('if [ "$USE_BUNDLE_EXEC" = "true" ]; then');
+        commands.push('  if command -v brew &>/dev/null; then');
+        commands.push('    BREW_RUBY="$(brew --prefix --installed ruby 2>/dev/null || true)"');
+        commands.push('    if [ -n "$BREW_RUBY" ] && [ -x "$BREW_RUBY/bin/ruby" ]; then');
+        commands.push('      export PATH="$BREW_RUBY/bin:$PATH"');
+        commands.push('    fi');
+        commands.push('  fi');
+        commands.push('  if ! command -v bundle &>/dev/null && ! command -v gem &>/dev/null; then');
+        commands.push('    USE_BUNDLE_EXEC="false"');
+        commands.push('    echo "No bundle or gem on PATH — running pod directly"');
+        commands.push('  fi');
+        commands.push('fi');
+        commands.push('if [ "$USE_BUNDLE_EXEC" = "true" ]; then');
+        commands.push('  export GEM_HOME="${CIBUILD_SCRATCH:-${TMPDIR:-/tmp}}/cibuild-gems"');
+        commands.push('  mkdir -p "$GEM_HOME"');
+        commands.push('  export PATH="$GEM_HOME/bin:$PATH"');
+        commands.push('  RUBY_VERSION_USED="$(ruby -e \'print RUBY_VERSION\' 2>/dev/null || echo unknown)"');
+        commands.push('  echo "Ruby: $(command -v ruby || echo none) ($RUBY_VERSION_USED), GEM_HOME: $GEM_HOME"');
+        commands.push('  LOCKED_BUNDLER=""');
+        commands.push('  if [ -f "Gemfile.lock" ]; then');
+        commands.push('    LOCKED_BUNDLER="$(awk \'/^BUNDLED WITH/ { getline; gsub(/[[:space:]]/, ""); print; exit }\' Gemfile.lock)"');
+        commands.push('  fi');
+        commands.push('  if [ -n "$LOCKED_BUNDLER" ]; then');
+        commands.push('    if ! gem list -i bundler -v "$LOCKED_BUNDLER" &>/dev/null; then');
+        commands.push('      echo "Installing bundler $LOCKED_BUNDLER, which Gemfile.lock names under BUNDLED WITH"');
+        commands.push('      if ! gem install bundler -v "$LOCKED_BUNDLER" --no-document; then');
+        commands.push('        echo "❌ Error: could not install bundler $LOCKED_BUNDLER (Gemfile.lock BUNDLED WITH) under Ruby $RUBY_VERSION_USED"');
+        commands.push('        exit 1');
+        commands.push('      fi');
+        commands.push('    fi');
+        commands.push('    BUNDLE_CMD="bundle _${LOCKED_BUNDLER}_"');
+        commands.push('  elif ! command -v bundle &>/dev/null; then');
+        commands.push('    echo "Installing bundler — none on PATH and Gemfile.lock names no version"');
+        commands.push('    gem install bundler --no-document');
         commands.push('  fi');
+        commands.push('  $BUNDLE_CMD install --quiet');
         commands.push('fi');
         commands.push('');
         // Build pod command
@@ -87,7 +139,7 @@ export class CocoapodsInstallStepExecutor extends BaseStepExecutor {
         // refused anonymous clone there fails the step exactly as it does during a
         // Swift package resolve — same signature, same fix.
         commands.push('if [ "$USE_BUNDLE_EXEC" = "true" ]; then');
-        commands.push('  POD_INVOCATION="bundle exec pod"');
+        commands.push('  POD_INVOCATION="$BUNDLE_CMD exec pod"');
         commands.push('else');
         commands.push('  POD_INVOCATION="pod"');
         commands.push('fi');