@invarn/cibuild 2.9.1 → 2.9.4

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,20 @@ 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.
+ *
+ * The path is resolved to its real one. On macOS /tmp and TMPDIR's /var are
+ * symlinks into /private, and analogcode/Swift-Radio-Pro's LNPopupController
+ * lists header directories with FileManager (real paths) but strips
+ * packageBase.path (the symlinked one) by text replacement: every header
+ * search path came out eight characters short.
  */
 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)"',
         '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 +872,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 +896,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 +1090,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 +1148,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.1",
+  "version": "2.9.4",
   "description": "CI Build CLI — local pipeline orchestration and validation",
   "type": "module",
   "main": "dist/cli.cjs",