@invarn/cibuild 2.9.2 → 2.9.5

package/dist/src/yaml/steps/xcode-simulator-archs.js

@@ -0,0 +1,98 @@
+/**
+ * The simulator architecture, chosen at run time.
+ *
+ * A pipeline pins `ARCHS=arm64` on its simulator builds: a *generic* simulator
+ * destination otherwise exports `ARCHS='arm64 x86_64'`, and anything that maps
+ * ARCHS onto a second toolchain meets an architecture nothing on the runner
+ * builds. But a project can exclude arm64 from the simulator
+ * (`EXCLUDED_ARCHS[sdk=iphonesimulator*] = arm64`, an Intel-era workaround),
+ * and then the pin leaves nothing to build: "None of the architectures in
+ * ARCHS (arm64) are valid", and CocoaPods' `[CP] Embed Pods Frameworks` dies
+ * on `ARCHS[@]: unbound variable`.
+ *
+ * Invarn switches to x86_64 at pipeline creation when the exclusion is in the
+ * repository (the pbxproj or the Podfile). A pod can also carry it, in its
+ * podspec's `user_target_xcconfig`, which CocoaPods writes into the app's
+ * `Pods-…debug.xcconfig` — and that exists only after `pod install`
+ * (ExistOrLive/GithubClient: WoodPeckeriOS 1.4.3, nightly-baseline issue 54).
+ * So the step asks Xcode, right before it builds, for the effective settings:
+ * `-showBuildSettings` reads the pbxproj, every xcconfig and the pods at once.
+ *
+ * Only an `ARCHS=arm64` pin is checked. An `ARCHS=x86_64` chosen at creation
+ * is left as it is, and options without a pin have nothing to decide.
+ */
+const ARM64_PIN = /(^|\s)ARCHS=arm64(?=\s|$)/;
+/** The variable the build line reads its simulator architecture from. */
+export const SIMULATOR_ARCHS_VAR = 'CIBUILD_SIMULATOR_ARCHS';
+/** Whether `xcodebuild_options` pins the simulator build to arm64. */
+export function pinsSimulatorArm64(xcodebuildOptions) {
+    return ARM64_PIN.test(xcodebuildOptions);
+}
+/** The options with the arm64 pin replaced by the run-time choice. */
+export function withRuntimeSimulatorArchs(xcodebuildOptions) {
+    return xcodebuildOptions.replace(ARM64_PIN, (_m, lead) => `${lead}ARCHS="$${SIMULATOR_ARCHS_VAR}"`);
+}
+/**
+ * Reads `xcodebuild -showBuildSettings -json` on stdin and prints one line
+ * naming the target that excludes arm64, or nothing. The application target
+ * decides when the scheme lists one; a framework the scheme also lists is not
+ * what is being built for the simulator. Output it cannot read is no
+ * evidence: it prints nothing and exits 0, and the build keeps arm64.
+ */
+export const ARM64_EXCLUSION_READER_SOURCE = String.raw `
+var input = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', function (d) { input += d; });
+process.stdin.on('end', function () {
+  var entries;
+  try { entries = JSON.parse(input); } catch (err) { return; }
+  if (!Array.isArray(entries)) return;
+  var apps = entries.filter(function (e) {
+    return e && e.buildSettings && e.buildSettings.PRODUCT_TYPE === 'com.apple.product-type.application';
+  });
+  var judged = apps.length > 0 ? apps : entries;
+  for (var i = 0; i < judged.length; i++) {
+    var e = judged[i];
+    var excluded = String((e && e.buildSettings && e.buildSettings.EXCLUDED_ARCHS) || '').trim();
+    if (excluded.split(/\s+/).indexOf('arm64') >= 0) {
+      process.stdout.write('target ' + e.target + ' sets EXCLUDED_ARCHS = ' + excluded + '\n');
+      return;
+    }
+  }
+});
+`;
+/**
+ * The lines that set `$CIBUILD_SIMULATOR_ARCHS`: arm64, or x86_64 when the
+ * project's effective simulator settings exclude arm64, saying so in the log.
+ * They expect `$PROJECT_TYPE` and `$DERIVED_DATA_PATH` to be set, and go after
+ * package resolution, so the settings are read from the graph the build uses.
+ */
+export function simulatorArchsLines(opts) {
+    let ask = 'xcodebuild -showBuildSettings -json';
+    ask += ` "$PROJECT_TYPE" '${opts.projectPath}'`;
+    ask += ` -scheme '${opts.scheme}'`;
+    if (opts.configuration)
+        ask += ` -configuration '${opts.configuration}'`;
+    ask += ` -destination '${opts.destination}'`;
+    ask += ' -derivedDataPath "$DERIVED_DATA_PATH"';
+    if (opts.xcconfig)
+        ask += ' -xcconfig "$XCCONFIG_FILE"';
+    return [
+        '# The simulator architecture, read after pod install: a pod can exclude',
+        '# arm64 through its user_target_xcconfig, which no file in the repository',
+        '# says until CocoaPods has run. See xcode-simulator-archs.ts.',
+        `${SIMULATOR_ARCHS_VAR}=arm64`,
+        'ARCHS_READER="$(mktemp -t cibuild-sim-archs).cjs"',
+        `cat > "$ARCHS_READER" << 'CIBUILD_SIM_ARCHS_EOF'`,
+        ARM64_EXCLUSION_READER_SOURCE.trim(),
+        'CIBUILD_SIM_ARCHS_EOF',
+        `ARM64_EXCLUDED_BY=$(${ask} 2>/dev/null | node "$ARCHS_READER" 2>/dev/null || true)`,
+        'rm -f "$ARCHS_READER"',
+        'if [ -n "$ARM64_EXCLUDED_BY" ]; then',
+        `  ${SIMULATOR_ARCHS_VAR}=x86_64`,
+        '  echo "Building the simulator app as x86_64, not arm64: $ARM64_EXCLUDED_BY in the project\'s effective simulator settings (after pod install)"',
+        'fi',
+        '',
+    ];
+}
+//# sourceMappingURL=xcode-simulator-archs.js.map

package/dist/src/yaml/steps/xcode-simulator-archs.test.d.ts

@@ -0,0 +1,21 @@
+/**
+ * A simulator build pinned to arm64, on a project whose effective settings
+ * exclude arm64 from the simulator, builds x86_64 instead — decided at run
+ * time, after `pod install`, from what Xcode itself reports.
+ *
+ * The witness (nightly-baseline issue 54): ExistOrLive/GithubClient @ 7969212a.
+ * Its pod WoodPeckeriOS 1.4.3 ships `user_target_xcconfig:
+ * { "EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64" }`, which CocoaPods writes
+ * into the app's `Pods-…debug.xcconfig`. The pipeline pinned `ARCHS=arm64`, so
+ * nothing was left to build and `[CP] Embed Pods Frameworks` died on
+ * `ARCHS[@]: unbound variable` (bld_b91e230368d6505e97ec9b75). Nothing in the
+ * repository says so before `pod install` has run.
+ *
+ * Measured on a clone, Xcode 26.4, 2026-10-01: after `pod install`,
+ * `xcodebuild -showBuildSettings -json … -destination 'generic/platform=iOS
+ * Simulator'` reported, for target ZLGitHubClient
+ * (com.apple.product-type.application), `EXCLUDED_ARCHS = "arm64"`, in 3 s;
+ * and `ARCHS=x86_64` compiled the app's sources.
+ */
+export {};
+//# sourceMappingURL=xcode-simulator-archs.test.d.ts.map

package/dist/src/yaml/steps/xcode-simulator-archs.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"xcode-simulator-archs.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/xcode-simulator-archs.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG"}

package/dist/src/yaml/steps/xcode-simulator-archs.test.js

@@ -0,0 +1,155 @@
+/**
+ * A simulator build pinned to arm64, on a project whose effective settings
+ * exclude arm64 from the simulator, builds x86_64 instead — decided at run
+ * time, after `pod install`, from what Xcode itself reports.
+ *
+ * The witness (nightly-baseline issue 54): ExistOrLive/GithubClient @ 7969212a.
+ * Its pod WoodPeckeriOS 1.4.3 ships `user_target_xcconfig:
+ * { "EXCLUDED_ARCHS[sdk=iphonesimulator*]": "arm64" }`, which CocoaPods writes
+ * into the app's `Pods-…debug.xcconfig`. The pipeline pinned `ARCHS=arm64`, so
+ * nothing was left to build and `[CP] Embed Pods Frameworks` died on
+ * `ARCHS[@]: unbound variable` (bld_b91e230368d6505e97ec9b75). Nothing in the
+ * repository says so before `pod install` has run.
+ *
+ * Measured on a clone, Xcode 26.4, 2026-10-01: after `pod install`,
+ * `xcodebuild -showBuildSettings -json … -destination 'generic/platform=iOS
+ * Simulator'` reported, for target ZLGitHubClient
+ * (com.apple.product-type.application), `EXCLUDED_ARCHS = "arm64"`, in 3 s;
+ * and `ARCHS=x86_64` compiled the app's sources.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { execFileSync } from 'node:child_process';
+import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { ARM64_EXCLUSION_READER_SOURCE, pinsSimulatorArm64, withRuntimeSimulatorArchs, } from './xcode-simulator-archs.js';
+import { XcodeBuildForSimulatorStepExecutor, XcodeBuildForTestStepExecutor, } from './xcode.js';
+import { testConfig } from './test-config.js';
+/** What `-showBuildSettings -json` printed for GithubClient, cut to the fields read. */
+const githubClient = [
+    {
+        action: 'build',
+        target: 'ZLGitHubClient',
+        buildSettings: {
+            PRODUCT_TYPE: 'com.apple.product-type.application',
+            EXCLUDED_ARCHS: 'arm64',
+            ARCHS: 'x86_64',
+        },
+    },
+];
+const read = (settings) => {
+    const dir = mkdtempSync(join(tmpdir(), 'sim-archs-'));
+    try {
+        const reader = join(dir, 'reader.cjs');
+        writeFileSync(reader, ARM64_EXCLUSION_READER_SOURCE);
+        return execFileSync('node', [reader], {
+            input: typeof settings === 'string' ? settings : JSON.stringify(settings),
+            encoding: 'utf8',
+        }).trim();
+    }
+    finally {
+        rmSync(dir, { recursive: true, force: true });
+    }
+};
+describe('the arm64 exclusion reader', () => {
+    test('names the app target that excludes arm64, and its setting', () => {
+        expect(read(githubClient)).toBe('target ZLGitHubClient sets EXCLUDED_ARCHS = arm64');
+    });
+    test('says nothing when arm64 is not excluded', () => {
+        expect(read([{ ...githubClient[0], buildSettings: { PRODUCT_TYPE: 'com.apple.product-type.application', EXCLUDED_ARCHS: '' } }])).toBe('');
+        expect(read([{ ...githubClient[0], buildSettings: { PRODUCT_TYPE: 'com.apple.product-type.application' } }])).toBe('');
+    });
+    test('reads arm64 as a word, not a substring', () => {
+        const s = (v) => [{ ...githubClient[0], buildSettings: { PRODUCT_TYPE: 'com.apple.product-type.application', EXCLUDED_ARCHS: v } }];
+        expect(read(s('i386 arm64'))).toBe('target ZLGitHubClient sets EXCLUDED_ARCHS = i386 arm64');
+        expect(read(s('arm64e'))).toBe('');
+    });
+    test('judges the application target, not a library the scheme also lists', () => {
+        const settings = [
+            { target: 'SomeKit', buildSettings: { PRODUCT_TYPE: 'com.apple.product-type.framework', EXCLUDED_ARCHS: 'arm64' } },
+            { target: 'App', buildSettings: { PRODUCT_TYPE: 'com.apple.product-type.application', EXCLUDED_ARCHS: '' } },
+        ];
+        expect(read(settings)).toBe('');
+    });
+    test('with no application target listed, any target that excludes arm64 counts', () => {
+        expect(read([{ target: 'Lib', buildSettings: { EXCLUDED_ARCHS: 'arm64' } }])).toBe('target Lib sets EXCLUDED_ARCHS = arm64');
+    });
+    test('unreadable output is no evidence: says nothing, exits 0', () => {
+        expect(read('')).toBe('');
+        expect(read('xcodebuild: error: not json')).toBe('');
+        expect(read({ not: 'an array' })).toBe('');
+    });
+});
+describe('pinsSimulatorArm64 / withRuntimeSimulatorArchs', () => {
+    const template = "-skipMacroValidation -skipPackagePluginValidation 'OTHER_CFLAGS=$(inherited) -Wno-error=parentheses' ARCHS=arm64";
+    test('the template line pins arm64', () => {
+        expect(pinsSimulatorArm64(template)).toBe(true);
+    });
+    test('an x86_64 already chosen at creation (issue 10) is not touched', () => {
+        const chosen = template.replace('ARCHS=arm64', 'ARCHS=x86_64');
+        expect(pinsSimulatorArm64(chosen)).toBe(false);
+        expect(withRuntimeSimulatorArchs(chosen)).toBe(chosen);
+    });
+    test('only a whole ARCHS=arm64 token counts', () => {
+        expect(pinsSimulatorArm64('VALID_ARCHS=arm64')).toBe(false);
+        expect(pinsSimulatorArm64('ARCHS=arm64e')).toBe(false);
+        expect(pinsSimulatorArm64('ARCHS=arm64 -quiet')).toBe(true);
+    });
+    test('the pin becomes the run-time variable, the rest of the line unchanged', () => {
+        expect(withRuntimeSimulatorArchs(template)).toBe("-skipMacroValidation -skipPackagePluginValidation 'OTHER_CFLAGS=$(inherited) -Wno-error=parentheses' ARCHS=\"$CIBUILD_SIMULATOR_ARCHS\"");
+    });
+});
+const steps = [
+    ['xcode-build-for-simulator', () => new XcodeBuildForSimulatorStepExecutor(), 'xcodebuild build "$PROJECT_TYPE"'],
+    ['xcode-build-for-test', () => new XcodeBuildForTestStepExecutor(), 'xcodebuild build-for-testing'],
+];
+describe.each(steps)('%s reads the exclusion at run time', (_name, make, buildMarker) => {
+    const script = async (xcodebuild_options) => (await make().execute({
+        project_path: 'ZLGitHubClient/ZLGitHubClient.xcworkspace',
+        scheme: 'ZLGitHubClient',
+        configuration: 'Debug',
+        destination: 'generic/platform=iOS Simulator',
+        xcodebuild_options,
+    }, {}, testConfig)).script;
+    const pinned = "'OTHER_CFLAGS=$(inherited) -Wno-error=parentheses' ARCHS=arm64";
+    test('asks Xcode for the effective settings, after resolution and before the build', async () => {
+        const s = await script(pinned);
+        const ask = s.indexOf('xcodebuild -showBuildSettings -json');
+        expect(ask).toBeGreaterThan(s.indexOf('xcodebuild -resolvePackageDependencies'));
+        expect(ask).toBeLessThan(s.indexOf(buildMarker));
+        const line = s.split('\n').find((l) => l.includes('-showBuildSettings'));
+        expect(line).toContain("-scheme 'ZLGitHubClient'");
+        expect(line).toContain("-configuration 'Debug'");
+        expect(line).toContain("-destination 'generic/platform=iOS Simulator'");
+    });
+    test('builds with the run-time choice, arm64 unless the project excludes it', async () => {
+        const s = await script(pinned);
+        expect(s).toContain('CIBUILD_SIMULATOR_ARCHS=arm64');
+        expect(s).toContain('CIBUILD_SIMULATOR_ARCHS=x86_64');
+        const build = s.split('\n').find((l) => l.startsWith(buildMarker.split(' "')[0]) && !l.includes('-showBuildSettings') && !l.includes('-resolvePackageDependencies'));
+        expect(build).toContain('ARCHS="$CIBUILD_SIMULATOR_ARCHS"');
+        expect(build).not.toContain('ARCHS=arm64');
+    });
+    test('says so in the log, as the creation-time switch does', async () => {
+        expect(await script(pinned)).toContain('Building the simulator app as x86_64, not arm64: ');
+    });
+    test('without an arm64 pin there is nothing to check', async () => {
+        for (const opts of ['', pinned.replace('arm64', 'x86_64')]) {
+            const s = await script(opts);
+            expect(s).not.toContain('-showBuildSettings');
+            expect(s).not.toContain('CIBUILD_SIMULATOR_ARCHS');
+        }
+    });
+    test('the emitted script is valid bash', async () => {
+        const dir = mkdtempSync(join(tmpdir(), 'sim-archs-sh-'));
+        try {
+            const f = join(dir, 's.sh');
+            writeFileSync(f, await script(pinned));
+            expect(() => execFileSync('bash', ['-n', f])).not.toThrow();
+        }
+        finally {
+            rmSync(dir, { recursive: true, force: true });
+        }
+    });
+});
+//# sourceMappingURL=xcode-simulator-archs.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

@@ -5,6 +5,7 @@ import { existsSync } from 'node:fs';
 import { BaseStepExecutor } from './base.js';
 import { resolveDestinationInput } from './xcode-destination.js';
 import { APP_PRODUCT_RESOLVER_SOURCE } from './xcode-app-product.js';
+import { pinsSimulatorArm64, simulatorArchsLines, withRuntimeSimulatorArchs } from './xcode-simulator-archs.js';
 import { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
 /**
  * Where derived data goes: outside the source tree, keyed by the output dir.
@@ -23,12 +24,30 @@ import { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
  * name the same output_dir still share derived data (the iOS template relies
  * on that to avoid compiling the app twice) and two that name different ones
  * stay apart, as they did before.
+ *
+ * **Never under /tmp** (nightly-baseline 58). analogcode/Swift-Radio-Pro's
+ * LNPopupController builds its header search paths by deleting
+ * `Context.packageDirectory` from the paths FileManager lists, and under /tmp
+ * the two disagree by `/private`: xcodebuild folds `/private/tmp` back to
+ * `/tmp` however the path is given, and FileManager does not, so every header
+ * path came out eight characters short ("troller/…"). Resolving the path did
+ * not help, for that reason. The guest's scratch root is
+ * `/tmp/cibuild-work-<id>`, so there derived data goes to the build user's
+ * real home instead. Measured on runner-mac-01 2026-10-03: the same build
+ * fails under /tmp and succeeds under the home, in a fresh VM each. Not
+ * /var/folders (TMPDIR): it built correctly there too. SwiftPM caches a
+ * manifest's evaluation, relative paths and all, so the first evaluation in a
+ * VM decides — another reason the root must be right from the first build.
  */
 function derivedDataPathLines() {
     return [
-        '# Derived data outside the source tree, keyed by the output dir',
-        'DERIVED_DATA_PATH="${CIBUILD_SCRATCH:-${TMPDIR:-/tmp}}/cibuild-derived-data/$(printf \'%s\' "$OUTPUT_DIR" | cksum | cut -d\' \' -f1)"',
+        '# Derived data outside the source tree, keyed by the output dir, and never under /tmp',
+        'cibuild_dd_root="${CIBUILD_SCRATCH:-${TMPDIR:-/tmp}}"',
+        'case "$(cd "$cibuild_dd_root" 2>/dev/null && pwd -P)" in /private/tmp|/private/tmp/*) cibuild_dd_root="${CIBUILD_USER_HOME:-$HOME}/Library/Developer/cibuild" ;; esac',
+        'DERIVED_DATA_PATH="$cibuild_dd_root/cibuild-derived-data/$(printf \'%s\' "$OUTPUT_DIR" | cksum | cut -d\' \' -f1)"',
         'mkdir -p "$DERIVED_DATA_PATH"',
+        '# Its real path: /tmp and TMPDIR are symlinks on macOS, and a package that builds paths by text arithmetic breaks on them',
+        'DERIVED_DATA_PATH="$(cd "$DERIVED_DATA_PATH" && pwd -P)"',
         'echo "Derived data: $DERIVED_DATA_PATH"',
     ];
 }
@@ -863,6 +882,16 @@ export class XcodeBuildForTestStepExecutor extends BaseStepExecutor {
                 ` -scheme '${escapedScheme}'` +
                 ' -derivedDataPath "$DERIVED_DATA_PATH"',
         }));
+        const pinsArm64 = pinsSimulatorArm64(xcodebuildOptions);
+        if (pinsArm64) {
+            commands.push(...simulatorArchsLines({
+                projectPath: escapedPath,
+                scheme: escapedScheme,
+                configuration: this.escapeBash(configuration),
+                destination: this.escapeBash(destination),
+                xcconfig: Boolean(xcconfigContent.trim()),
+            }));
+        }
         // Build command
         let cmd = 'xcodebuild build-for-testing';
         cmd += ` "$PROJECT_TYPE" '${escapedPath}'`;
@@ -877,7 +906,7 @@ export class XcodeBuildForTestStepExecutor extends BaseStepExecutor {
             cmd += ' -xcconfig "$XCCONFIG_FILE"';
         }
         if (xcodebuildOptions) {
-            cmd += ` ${xcodebuildOptions}`;
+            cmd += ` ${pinsArm64 ? withRuntimeSimulatorArchs(xcodebuildOptions) : xcodebuildOptions}`;
         }
         commands.push(cmd);
         commands.push('');
@@ -1071,6 +1100,16 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
                 ` -scheme '${escapedScheme}'` +
                 ' -derivedDataPath "$DERIVED_DATA_PATH"',
         }));
+        const pinsArm64 = pinsSimulatorArm64(xcodebuildOptions);
+        if (pinsArm64) {
+            commands.push(...simulatorArchsLines({
+                projectPath: escapedPath,
+                scheme: escapedScheme,
+                configuration: configuration ? this.escapeBash(configuration) : '',
+                destination: this.escapeBash(destination),
+                xcconfig: true,
+            }));
+        }
         // Build command
         let cmd = 'xcodebuild';
         if (performClean === 'yes') {
@@ -1119,7 +1158,7 @@ export class XcodeBuildForSimulatorStepExecutor extends BaseStepExecutor {
         cmd += ` -derivedDataPath "$DERIVED_DATA_PATH"`;
         cmd += ' -xcconfig "$XCCONFIG_FILE"';
         if (xcodebuildOptions) {
-            cmd += ` ${xcodebuildOptions}`;
+            cmd += ` ${pinsArm64 ? withRuntimeSimulatorArchs(xcodebuildOptions) : xcodebuildOptions}`;
         }
         commands.push(cmd);
         commands.push('');

package/package.json

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