@invarn/cibuild 2.7.3 → 2.7.5

package/dist/src/yaml/steps/xcode-derived-data.test.js

@@ -0,0 +1,103 @@
+/**
+ * Products go under a derived data path, never into one flat directory.
+ *
+ * `CONFIGURATION_BUILD_DIR` overrides the per-configuration/per-platform
+ * product separation xcodebuild provides under
+ * `DerivedData/Build/Products/<config>-<platform>/`, flattening every target in
+ * the graph into a single directory. Two build tasks for the same target then
+ * declare the same absolute output path and xcodebuild refuses the entire build
+ * with "Multiple commands produce". The notes it prints name the SAME target
+ * twice, which is the tell: one target built twice into one directory, not two
+ * packages colliding on a name.
+ *
+ * Measured 2026-09-09 on the iOS corpus rows, all on the template's must-pass
+ * "Build App" step: 16 collisions on jellyfin/Swiftfin, 266 on
+ * Automattic/pocket-casts-ios, 425 on home-assistant/iOS.
+ *
+ * A fourth row failed differently for the same reason. CocoaPods derives
+ * `PODS_CONFIGURATION_BUILD_DIR` from `BUILD_DIR`, which `CONFIGURATION_BUILD_DIR`
+ * does NOT override — so pod products land in the flat directory while every
+ * generated copy-resources script and linker search path still points into
+ * DerivedData. shenruisi/Stay reported "Resource SDWebImage.bundle not found.
+ * Run pod install" for a bundle that had been built two directories away.
+ *
+ * Proved by control on a runner guest, same repo and image and flags with only
+ * this setting differing: `CONFIGURATION_BUILD_DIR` reproduced the collision and
+ * exit 65 with no .app, `-derivedDataPath` reached BUILD SUCCEEDED in 2m06s and
+ * left both `Debug` and `Debug-iphonesimulator` under Products.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { XcodeBuildStepExecutor, XcodeBuildForTestStepExecutor, XcodeBuildForSimulatorStepExecutor, } from './xcode.js';
+import { testConfig } from './test-config.js';
+const DERIVED = '-derivedDataPath "$OUTPUT_DIR/DerivedData"';
+const scriptFor = async (executor, inputs) => {
+    const result = await executor.execute({ project_path: 'MyApp.xcodeproj', scheme: 'MyApp', ...inputs }, {}, testConfig);
+    return result.script;
+};
+const buildingExecutors = () => [
+    ['xcodebuild', new XcodeBuildStepExecutor()],
+    ['xcode-build-for-test', new XcodeBuildForTestStepExecutor()],
+    ['xcode-build-for-simulator', new XcodeBuildForSimulatorStepExecutor()],
+];
+describe('no xcode step flattens the product tree', () => {
+    test.each(buildingExecutors())('%s never passes CONFIGURATION_BUILD_DIR', async (_name, executor) => {
+        expect(await scriptFor(executor, {})).not.toContain('CONFIGURATION_BUILD_DIR');
+    });
+    test.each(buildingExecutors())('%s builds into a derived data path', async (_name, executor) => {
+        expect(await scriptFor(executor, {})).toContain(DERIVED);
+    });
+});
+describe('the resolve and the build read the same derived data', () => {
+    // If they diverge, the retried resolve populates one location and the build
+    // re-resolves into another — the retry is spent on work that is thrown away,
+    // and a refused fetch fails the expensive half anyway.
+    test.each(buildingExecutors())('%s', async (_name, executor) => {
+        const script = await scriptFor(executor, {});
+        const lines = script.split('\n');
+        const resolveLine = lines.find((l) => l.includes('-resolvePackageDependencies'));
+        const buildLine = lines.find((l) => /^xcodebuild (build|clean build|build-for-testing)/.test(l.trim()));
+        expect(resolveLine).toBeDefined();
+        expect(buildLine).toBeDefined();
+        expect(resolveLine).toContain(DERIVED);
+        expect(buildLine).toContain(DERIVED);
+    });
+});
+describe('xcode-build-for-simulator finds the .app where it now lands', () => {
+    // The guard is the step's strongest statement that the app compiled, so it
+    // has to follow the products. Left at `find "$OUTPUT_DIR" -maxdepth 1` it
+    // matches nothing and fails every build with ".app not found" while the app
+    // has in fact built perfectly.
+    const build = (inputs = {}) => scriptFor(new XcodeBuildForSimulatorStepExecutor(), inputs);
+    test('searches under the per-platform Products directory', async () => {
+        const script = await build();
+        expect(script).toContain('find "$OUTPUT_DIR/DerivedData/Build/Products"');
+    });
+    test('searches deep enough to reach <config>-<platform>/Foo.app', async () => {
+        // Products/Debug-iphonesimulator/MyApp.app is two levels down. maxdepth 1
+        // would find the configuration directory and no .app at all.
+        const findLine = (await build())
+            .split('\n')
+            .find((l) => l.includes('-name "*.app"'));
+        expect(findLine).toContain('-maxdepth 2');
+    });
+    test('still fails the step when nothing landed', async () => {
+        const script = await build();
+        expect(script).toContain('if [ -z "$APP_PATH" ]; then');
+        expect(script).toContain('exit 1');
+    });
+    test('still exports the app path for later steps', async () => {
+        expect(await build()).toContain('envman add --key CIBUILD_APP_DIR_PATH');
+    });
+});
+describe('the output_dir input still steers where everything goes', () => {
+    // The template gives "Build App" its own output_dir, so derived data has to
+    // follow that input rather than a hardcoded path.
+    test('a custom output_dir is what OUTPUT_DIR resolves to', async () => {
+        const script = await scriptFor(new XcodeBuildForSimulatorStepExecutor(), {
+            output_dir: 'build/app',
+        });
+        expect(script).toContain(`OUTPUT_DIR="$(cd 'build/app' && pwd)"`);
+        expect(script).toContain(DERIVED);
+    });
+});
+//# sourceMappingURL=xcode-derived-data.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"xcode.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"xcode.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode.ts"],"names":[],"mappings":"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"}

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

@@ -52,10 +52,13 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
         commands.push(`echo "Building project: ${this.escapeBash(projectPath)}"`);
         commands.push(`echo "Scheme: ${this.escapeBash(scheme)}"`);
         commands.push(`echo "Configuration: ${this.escapeBash(configuration)}"`);
-        // Create output directory and resolve to absolute path
-        // Using an absolute path for CONFIGURATION_BUILD_DIR prevents xcodebuild from
-        // creating a 'build' directory inside each SPM package checkout in DerivedData,
-        // which causes "File exists but is not a directory" errors on repeated runs.
+        // Create output directory and resolve to absolute path. The absolute path
+        // is the load-bearing part: a relative one let xcodebuild create a `build`
+        // directory inside each SPM package checkout in DerivedData, which fails
+        // with "File exists but is not a directory" on repeated runs. That was
+        // originally fixed by making CONFIGURATION_BUILD_DIR absolute; it is now
+        // -derivedDataPath that is absolute instead, which fixes the same thing
+        // without flattening the product tree.
         commands.push('');
         commands.push('# Create output directory and resolve to absolute path');
         commands.push(`mkdir -p '${this.escapeBash(outputDir)}'`);
@@ -81,9 +84,10 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
         commands.push('fi');
         // Resolve the package graph before building, and retry that on a refused
         // fetch. Resolution is seconds and the build is minutes, so the retry is
-        // spent on the cheap half. No -derivedDataPath here: this step does not
-        // set one for the build either, so both use the default location and the
-        // build finds the graph this just resolved.
+        // spent on the cheap half. The two -derivedDataPath arguments move
+        // together: the build below reads the same derived data and finds the
+        // graph already resolved. Split them and the retry is spent on work the
+        // build discards.
         commands.push('');
         commands.push('# Resolve package dependencies first — see git-fetch-retry');
         commands.push(...refusedFetchHelpers());
@@ -91,7 +95,8 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
             label: 'Package resolution',
             command: 'xcodebuild -resolvePackageDependencies' +
                 ` "$PROJECT_TYPE" '${escapedPath}'` +
-                ` -scheme '${this.escapeBash(scheme)}'`,
+                ` -scheme '${this.escapeBash(scheme)}'` +
+                ' -derivedDataPath "$OUTPUT_DIR/DerivedData"',
         }));
         // Build xcodebuild command
         commands.push('');
@@ -106,8 +111,14 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
         xcodebuildCmd += ` -scheme '${this.escapeBash(scheme)}'`;
         xcodebuildCmd += ` -configuration '${this.escapeBash(configuration)}'`;
         xcodebuildCmd += ` -destination '${this.escapeBash(destination)}'`;
-        // Add build path (absolute, resolved above)
-        xcodebuildCmd += ` CONFIGURATION_BUILD_DIR="$OUTPUT_DIR"`;
+        // Derived data under the output dir, rather than CONFIGURATION_BUILD_DIR.
+        // Same reasoning as XcodeBuildForSimulatorStepExecutor below, where the
+        // full mechanism and the control are written up: the flat directory
+        // collapses xcodebuild's per-configuration/per-platform product separation
+        // and any graph with two tasks producing the same output name is refused
+        // with "Multiple commands produce". It also desynchronises CocoaPods, whose
+        // PODS_CONFIGURATION_BUILD_DIR follows BUILD_DIR and not this setting.
+        xcodebuildCmd += ` -derivedDataPath "$OUTPUT_DIR/DerivedData"`;
         // Add xcconfig if provided
         if (xcconfigContent && xcconfigContent.trim() !== '') {
             xcodebuildCmd += ' -xcconfig "$XCCONFIG_FILE"';
@@ -117,8 +128,11 @@ export class XcodeBuildStepExecutor extends BaseStepExecutor {
         commands.push('');
         commands.push('# Build completed');
         commands.push('echo "Build completed successfully"');
-        commands.push('echo "Build artifacts in: $OUTPUT_DIR"');
-        commands.push('ls -lh "$OUTPUT_DIR" || true');
+        // Products live under the per-platform Products directory now, not flat in
+        // $OUTPUT_DIR, so point the listing at where they actually are — otherwise
+        // the log says "artifacts in build/" above an empty directory.
+        commands.push('echo "Build artifacts in: $OUTPUT_DIR/DerivedData/Build/Products"');
+        commands.push('ls -lhR "$OUTPUT_DIR/DerivedData/Build/Products" 2>/dev/null || true');
         const script = this.createBashScriptFromCommands(commands, stepName);
         return this.createScriptStep(script, stepName);
     }
@@ -1013,16 +1027,19 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
         commands.push('');
         // Resolve the package graph before building, under the refused-fetch
         // retry. This is the step an iOS app is normally built with, so it is the
-        // one a refused dependency fetch lands on first. No -derivedDataPath: the
-        // build below does not set one either, so both use the default location
-        // and the build finds the graph this just resolved.
+        // one a refused dependency fetch lands on first. The build below reads the
+        // same derived data and finds the graph already resolved — the two
+        // -derivedDataPath arguments have to move together, or the resolve
+        // populates one location and the build re-resolves into another, which
+        // silently spends the retry on work the build then throws away.
         commands.push('# Resolve package dependencies first — see git-fetch-retry');
         commands.push(...refusedFetchHelpers());
         commands.push(...retryOnRefusedFetch({
             label: 'Package resolution',
             command: 'xcodebuild -resolvePackageDependencies' +
                 ` "$PROJECT_TYPE" '${escapedPath}'` +
-                ` -scheme '${escapedScheme}'`,
+                ` -scheme '${escapedScheme}'` +
+                ' -derivedDataPath "$OUTPUT_DIR/DerivedData"',
         }));
         // Build command
         let cmd = 'xcodebuild';
@@ -1036,18 +1053,54 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
             cmd += ` -configuration '${this.escapeBash(configuration)}'`;
         }
         cmd += ` -destination '${this.escapeBash(destination)}'`;
-        cmd += ` CONFIGURATION_BUILD_DIR="$OUTPUT_DIR"`;
+        // -derivedDataPath rather than CONFIGURATION_BUILD_DIR. The latter was set
+        // to keep xcodebuild from writing a `build` directory inside each SPM
+        // package checkout in DerivedData ("File exists but is not a directory" on
+        // repeated runs) — but note what that fix actually was: making the path
+        // ABSOLUTE. Pointing derived data somewhere writable achieves the same
+        // thing without the cost below, and matches xcode-build-for-test.
+        //
+        // The cost, measured 2026-09-09 on four of the six iOS corpus rows:
+        // CONFIGURATION_BUILD_DIR overrides the per-configuration/per-platform
+        // product separation xcodebuild normally provides under
+        // DerivedData/Build/Products/<config>-<platform>/, flattening every target
+        // in the graph into ONE directory. Two build tasks for the same target then
+        // declare the same absolute output path and xcodebuild refuses the whole
+        // build with "Multiple commands produce". Read the notes it prints: they
+        // name the SAME target twice. It is not two packages colliding on a name,
+        // it is one target built twice into one directory. 16 collisions on
+        // jellyfin/Swiftfin, 266 on Automattic/pocket-casts-ios, 425 on
+        // home-assistant/iOS.
+        //
+        // It also breaks CocoaPods, which is the same defect wearing a disguise.
+        // CocoaPods derives PODS_CONFIGURATION_BUILD_DIR from BUILD_DIR, and
+        // BUILD_DIR is NOT what CONFIGURATION_BUILD_DIR overrides — so pod products
+        // are written to the flat directory while every generated copy-resources
+        // script and linker search path still points into DerivedData. On
+        // shenruisi/Stay that surfaced as "Resource SDWebImage.bundle not found.
+        // Run pod install", for a bundle that had in fact been built, two
+        // directories away.
+        //
+        // Proved by control, same repo and image and flags, only this line
+        // differing: CONFIGURATION_BUILD_DIR reproduced the collision and exit 65
+        // with no .app; -derivedDataPath reached BUILD SUCCEEDED in 2m06s and left
+        // both Debug and Debug-iphonesimulator under Products — the separation the
+        // flat directory destroys.
+        cmd += ` -derivedDataPath "$OUTPUT_DIR/DerivedData"`;
         cmd += ' -xcconfig "$XCCONFIG_FILE"';
         if (xcodebuildOptions) {
             cmd += ` ${xcodebuildOptions}`;
         }
         commands.push(cmd);
         commands.push('');
-        // Locate .app
+        // Locate .app. It now lands under the per-platform Products directory
+        // rather than flat in $OUTPUT_DIR, so the guard has to follow it — at
+        // maxdepth 1 this found nothing and the step would fail every build with
+        // ".app not found" while the app had compiled perfectly.
         commands.push('# Locate generated .app');
-        commands.push('APP_PATH=$(find "$OUTPUT_DIR" -maxdepth 1 -name "*.app" -type d | head -1)');
+        commands.push('APP_PATH=$(find "$OUTPUT_DIR/DerivedData/Build/Products" -maxdepth 2 -name "*.app" -type d 2>/dev/null | head -1)');
         commands.push('if [ -z "$APP_PATH" ]; then');
-        commands.push('  echo "❌ Error: .app not found in $OUTPUT_DIR"');
+        commands.push('  echo "❌ Error: .app not found under $OUTPUT_DIR/DerivedData/Build/Products"');
         commands.push('  exit 1');
         commands.push('fi');
         commands.push('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@invarn/cibuild",
-  "version": "2.7.3",
+  "version": "2.7.5",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",