@invarn/cibuild 2.9.4 → 2.9.6

package/dist/src/yaml/steps/gradle-memory.js

@@ -46,18 +46,8 @@
  */
 /** The share of the machine's memory the two daemon heaps may take together. */
 export const GRADLE_HEAP_SHARE_PERCENT = 75;
-export const GRADLE_MEMORY_FUNCTIONS = `# This machine's memory in MiB, or nothing when it cannot be read.
-cibuild_mem_mib() {
-  if [ -r /proc/meminfo ]; then
-    awk '/^MemTotal:/ { print int($2 / 1024); exit }' /proc/meminfo
-  else
-    local bytes
-    bytes=$(sysctl -n hw.memsize 2>/dev/null || true)
-    if [ -n "$bytes" ]; then echo $(( bytes / 1048576 )); fi
-  fi
-}
-
-# $1 a .properties file, $2 a key. Prints "<line number><TAB><value>" for the
+/** Reads one key of a .properties file, as Java does: the last assignment wins. */
+const GRADLE_PROP_LINE_FUNCTION = `# $1 a .properties file, $2 a key. Prints "<line number><TAB><value>" for the
 # last assignment of the key, or nothing.
 cibuild_prop_line() {
   [ -f "$1" ] || return 0
@@ -70,8 +60,53 @@ cibuild_prop_line() {
     }
     END { if (found != "") print found }
   ' "$1"
+}`;
+/**
+ * Sends a Kotlin Multiplatform project's metadata compiles
+ * (compile*KotlinMetadata, the KotlinCompileCommon tasks) to the Kotlin daemon
+ * while every other Kotlin compile stays in-process. With
+ * -Pkotlin.compiler.execution.strategy=in-process, Kotlin 2.2.0 compiled
+ * DroidKaigi/conference-app-2025's common metadata in K1 mode and rejected its
+ * context parameters; the same task on the daemon passed (nightly-baseline 95).
+ *
+ * The Kotlin plugin's classes are not on an init script's classpath, so the
+ * task is matched by class name and the strategy enum is loaded through the
+ * task's own classloader. A Kotlin plugin without the property (older than the
+ * strategy API) is left alone: this script must never fail a build. Lazy
+ * (configureEach where Gradle has it), so it is configuration-cache safe and
+ * realizes no task. It runs once per build, included builds as well; they
+ * have no metadata compiles to touch.
+ */
+export const KOTLIN_METADATA_DAEMON_INIT_SCRIPT = `// cibuild: Kotlin metadata compiles run in the Kotlin daemon (nightly-baseline 95).
+allprojects {
+  def hook = { t ->
+    if (!t.class.name.startsWith('org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon')) return
+    try {
+      def strategy = t.class.classLoader.loadClass('org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy')
+      t.compilerExecutionStrategy.set(strategy.enumConstants.find { it.name() == 'DAEMON' })
+    } catch (Throwable ignored) {
+    }
+  }
+  try {
+    tasks.configureEach(hook)
+  } catch (MissingMethodException ignored) {
+    tasks.all(hook)
+  }
+}
+`;
+export const GRADLE_MEMORY_FUNCTIONS = `# This machine's memory in MiB, or nothing when it cannot be read.
+cibuild_mem_mib() {
+  if [ -r /proc/meminfo ]; then
+    awk '/^MemTotal:/ { print int($2 / 1024); exit }' /proc/meminfo
+  else
+    local bytes
+    bytes=$(sysctl -n hw.memsize 2>/dev/null || true)
+    if [ -n "$bytes" ]; then echo $(( bytes / 1048576 )); fi
+  fi
 }
 
+${GRADLE_PROP_LINE_FUNCTION}
+
 # The -Xmx of a JVM argument string in MiB (the last one wins, as in the JVM),
 # or nothing when it has none.
 cibuild_xmx_mib() {
@@ -91,6 +126,40 @@ cibuild_xmx_mib() {
     END { if (r != "") print r }'
 }
 
+# The -XX:MaxMetaspaceSize of a JVM argument string in MiB (the last one
+# wins), or nothing when it has none.
+cibuild_metaspace_mib() {
+  printf '%s\\n' "$1" | tr ' \\t,' '\\n\\n\\n' | awk '
+    /^-XX:MaxMetaspaceSize=[0-9]+[kKmMgGtT]?$/ {
+      n = substr($0, 22); u = substr(n, length(n))
+      if (u ~ /[0-9]/) { v = n / 1048576 }
+      else {
+        n = substr(n, 1, length(n) - 1)
+        if (u ~ /[kK]/) v = n / 1024
+        else if (u ~ /[mM]/) v = n
+        else if (u ~ /[gG]/) v = n * 1024
+        else v = n * 1048576
+      }
+      r = int(v)
+    }
+    END { if (r != "") print r }'
+}
+
+# $1 a JVM argument string, $2 a size in MiB: the same arguments with every
+# -XX:MaxMetaspaceSize replaced by that one.
+cibuild_with_metaspace() (
+  set -f
+  out=""
+  replaced=0
+  for arg in $1; do
+    case "$arg" in
+      -XX:MaxMetaspaceSize=*) if [ "$replaced" -eq 0 ]; then out="$out -XX:MaxMetaspaceSize=\${2}m"; replaced=1; fi ;;
+      *) out="$out $arg" ;;
+    esac
+  done
+  printf '%s' "\${out# }"
+)
+
 # $1 a JVM argument string, $2 a heap in MiB: the same arguments with every
 # -Xmx replaced by that one (added in front when there was none).
 cibuild_with_xmx() (
@@ -119,10 +188,32 @@ cibuild_scaled_heap() {
   echo "$v"
 }
 
+# The Kotlin daemon heap a multiplatform project's metadata compiles get out
+# of a budget in MiB: an eighth, rounded down to 64 MiB, from 512 MiB to 1 GiB.
+cibuild_metadata_daemon_heap() {
+  local v=$(( $1 / 8 / 64 * 64 ))
+  [ "$v" -ge 512 ] || v=512
+  [ "$v" -le 1024 ] || v=1024
+  echo "$v"
+}
+
+# Whether the Gradle project here applies Kotlin Multiplatform: a build script
+# or version catalog that names the plugin. Convention plugins in buildSrc or
+# an included build sit a few directories down; build outputs are not read.
+cibuild_applies_kotlin_multiplatform() {
+  local f
+  while IFS= read -r -d '' f; do
+    if grep -q -E 'kotlin\\("multiplatform"\\)|org\\.jetbrains\\.kotlin\\.multiplatform|kotlin-multiplatform|kotlinMultiplatform' "$f" 2>/dev/null; then return 0; fi
+  done < <(find . -maxdepth 6 \\( -name .git -o -name node_modules -o -name build -o -name .gradle \\) -prune -o -type f \\( -name '*.gradle' -o -name '*.gradle.kts' -o -name '*.versions.toml' \\) -print0 2>/dev/null)
+  return 1
+}
+
 # The plan, from its inputs only, so a test can run it:
 #   $1 this machine's memory in MiB (empty when unknown)
 #   $2 the project's gradle.properties   $3 the Gradle user home's
 #   $4 JVM arguments the pipeline asks for instead (may be empty)
+#   $5 the metadata init script, when the project applies Kotlin
+#      Multiplatform (empty otherwise)
 # Sets CIBUILD_GRADLE_MEMORY_ARGS (extra Gradle arguments),
 # CIBUILD_GRADLE_MEMORY_LINE (what to print before Gradle runs; empty when
 # nothing changes) and CIBUILD_GRADLE_MEMORY_SENTENCE (what to print if a
@@ -133,7 +224,7 @@ cibuild_scaled_heap() {
 # its own inherits the Gradle daemon's, and in-process compilation has no
 # Kotlin daemon at all.
 cibuild_gradle_memory_plan() {
-  local mem="$1" project="$2" user="$3" preferred="$4" l
+  local mem="$1" project="$2" user="$3" preferred="$4" init="\${5:-}" l
   local jvm="" jvm_at="" kd="" kd_at="" strategy=""
   CIBUILD_GRADLE_MEMORY_ARGS=()
   CIBUILD_GRADLE_MEMORY_LINE=""
@@ -203,18 +294,66 @@ cibuild_gradle_memory_plan() {
   # One heap, the whole budget. Two did not fit: ReFra's Kotlin daemon was
   # lost mid-compile at a 60/40 split, and mifos-mobile's Gradle daemon ran out
   # of its 40 %. In-process, Kotlin compiles in the Gradle daemon's heap.
-  local ng now
-  ng=$(cibuild_scaled_heap "$budget" 1 1)
-  CIBUILD_GRADLE_MEMORY_ARGS=("-Dorg.gradle.jvmargs=$(cibuild_with_xmx "$jvm" "$ng")")
+  # A multiplatform project's metadata compiles are the exception: they go to
+  # a small Kotlin daemon (the init script), carved out of the same budget.
+  local ng now newjvm mg mk md=""
+  if [ "$k" -gt 0 ] && [ -n "$init" ]; then md=$(cibuild_metadata_daemon_heap "$budget"); fi
+  ng=$(cibuild_scaled_heap $(( budget - \${md:-0} )) 1 1)
+  newjvm=$(cibuild_with_xmx "$jvm" "$ng")
   now="Gradle -Xmx\${ng}m"
   if [ "$k" -gt 0 ]; then
-    CIBUILD_GRADLE_MEMORY_ARGS+=("-Pkotlin.compiler.execution.strategy=in-process")
+    # One JVM now holds what two did, so a Metaspace cap Gradle declared must
+    # hold Kotlin's too: the Kotlin daemon's own (kotlin.daemon.jvmargs, or
+    # -Dkotlin.daemon.jvm.options in Gradle's), else the Gradle one it
+    # inherits. GetStream/whatsApp-clone-compose capped Gradle at 512m and gave
+    # Kotlin 1g, and in-process compileDebugKotlin ran out of Metaspace
+    # (nightly-baseline 79). No Gradle cap, nothing to raise.
+    mg=$(cibuild_metaspace_mib "$jvm")
+    if [ -n "$mg" ]; then
+      mk=$(cibuild_metaspace_mib "$kd")
+      [ -n "$mk" ] || mk=$(cibuild_metaspace_mib "$(printf '%s\\n' "$jvm" | tr ' \\t' '\\n\\n' | sed -n 's/^-Dkotlin\\.daemon\\.jvm\\.options=//p')")
+      [ -n "$mk" ] || mk="$mg"
+      newjvm=$(cibuild_with_metaspace "$newjvm" $(( mg + mk )))
+      now="$now with -XX:MaxMetaspaceSize=$(( mg + mk ))m (Gradle's \${mg}m and Kotlin's \${mk}m, in one JVM now)"
+    fi
     now="$now and Kotlin compiled in-process in it (kotlin.compiler.execution.strategy=in-process: one heap, not a Gradle and a Kotlin daemon)"
   fi
+  if [ -n "$md" ]; then
+    now="$now, and Kotlin metadata compiles (compile*KotlinMetadata) in a Kotlin daemon of -Xmx\${md}m beside it (in-process, Kotlin 2.2 compiled them in K1 mode)"
+  fi
+  CIBUILD_GRADLE_MEMORY_ARGS=("-Dorg.gradle.jvmargs=$newjvm")
+  if [ "$k" -gt 0 ]; then
+    CIBUILD_GRADLE_MEMORY_ARGS+=("-Pkotlin.compiler.execution.strategy=in-process")
+  fi
+  if [ -n "$md" ]; then
+    CIBUILD_GRADLE_MEMORY_ARGS+=("-Pkotlin.daemon.jvmargs=-Xmx\${md}m" --init-script "$init")
+  fi
   CIBUILD_GRADLE_MEMORY_LINE="Gradle memory: this machine has $(cibuild_gib "$mem") GiB and the declared heaps ask for $(cibuild_gib "$total") GiB ($asked), past the $(cibuild_gib "$budget") GiB this build allows them. Running with $now, set on the command line."
   CIBUILD_GRADLE_MEMORY_SENTENCE="$CIBUILD_GRADLE_MEMORY_SENTENCE This build ran them capped: $now."
 }
 
+# $1 the project's gradle.properties, $2 the Gradle user home's. A JDK path the
+# project pins with org.gradle.java.home that is not on this machine — a
+# developer's own, like SEAbdulbasit/MusicApp-KMP's
+# /Users/abdulbasit/Library/Java/... (nightly-baseline 83) — stops Gradle
+# before it starts: "given for org.gradle.java.home Gradle property is
+# invalid". On the command line, -Dorg.gradle.java.home beats both files
+# (measured, Gradle 8.14.3), so the build's own JDK is passed instead. A path
+# that exists is left alone. Sets CIBUILD_GRADLE_JAVA_HOME_LINE.
+cibuild_gradle_java_home_plan() {
+  local l v="" at=""
+  CIBUILD_GRADLE_JAVA_HOME_LINE=""
+  for f in "$2" "$1"; do
+    l=$(cibuild_prop_line "$f" org.gradle.java.home)
+    if [ -n "$l" ]; then v="\${l#*	}"; at="$f:\${l%%	*}"; break; fi
+  done
+  [ -n "$v" ] || return 0
+  [ -d "$v" ] && return 0
+  [ -n "\${JAVA_HOME:-}" ] && [ -d "$JAVA_HOME" ] || return 0
+  CIBUILD_GRADLE_MEMORY_ARGS+=("-Dorg.gradle.java.home=$JAVA_HOME")
+  CIBUILD_GRADLE_JAVA_HOME_LINE="Gradle: org.gradle.java.home=$v at $at is not on this machine; running with this build's JDK, $JAVA_HOME (-Dorg.gradle.java.home on the command line)."
+}
+
 # $1 the number of Gradle workers the pipeline asks for (may be empty). Adds
 # --max-workers to the plan's arguments; run after cibuild_gradle_memory_plan.
 # Sets CIBUILD_GRADLE_WORKERS_LINE (what to print; empty when nothing asked).
@@ -282,11 +421,19 @@ cibuild_gradle() {
 # (either may be empty). Run in the Gradle project directory, after GRADLE_CMD
 # is chosen.
 cibuild_gradle_memory_cap() {
+  local metadata_init=""
+  if cibuild_applies_kotlin_multiplatform; then
+    metadata_init="$(mktemp -d)/cibuild-kotlin-metadata-daemon.init.gradle"
+    cat > "$metadata_init" <<'CIBUILD_KOTLIN_METADATA_INIT'
+${KOTLIN_METADATA_DAEMON_INIT_SCRIPT}CIBUILD_KOTLIN_METADATA_INIT
+  fi
   cibuild_gradle_memory_plan "$(cibuild_mem_mib || true)" "gradle.properties" \\
-    "\${GRADLE_USER_HOME:-$HOME/.gradle}/gradle.properties" "$1"
+    "\${GRADLE_USER_HOME:-$HOME/.gradle}/gradle.properties" "$1" "$metadata_init"
   cibuild_gradle_workers_plan "$2"
+  cibuild_gradle_java_home_plan "gradle.properties" "\${GRADLE_USER_HOME:-$HOME/.gradle}/gradle.properties"
   if [ -n "$CIBUILD_GRADLE_MEMORY_LINE" ]; then echo "$CIBUILD_GRADLE_MEMORY_LINE"; fi
   if [ -n "$CIBUILD_GRADLE_WORKERS_LINE" ]; then echo "$CIBUILD_GRADLE_WORKERS_LINE"; fi
+  if [ -n "$CIBUILD_GRADLE_JAVA_HOME_LINE" ]; then echo "$CIBUILD_GRADLE_JAVA_HOME_LINE"; fi
   CIBUILD_GRADLE_BIN="$GRADLE_CMD"
   GRADLE_CMD=cibuild_gradle
 }`;
@@ -308,4 +455,41 @@ export function gradleMemoryCommands(jvmargs, escape, maxWorkers = '') {
         `cibuild_gradle_memory_cap '${escape(jvmargs)}' '${escape(maxWorkers)}'`,
     ];
 }
+/**
+ * A pinned org.gradle.java.home that is not on this machine, made to name the
+ * build's JDK for every Gradle run in the build. The Gradle steps already pass
+ * -Dorg.gradle.java.home on their own command line; a script step's
+ * ./gradlew and a build phase Xcode runs do not, and they read the checkout's
+ * gradle.properties. SEAbdulbasit/MusicApp-KMP's Android step went on with the
+ * override and its KMM "Prepare the iOS build" script stopped on the same
+ * "given for org.gradle.java.home Gradle property is invalid"
+ * (nightly-baseline 92). So the line itself is rewritten, in every
+ * gradle.properties of the checkout, once the build's JDK is chosen. A path
+ * that exists, an empty value or a commented-out line is left alone.
+ */
+export const GRADLE_JAVA_HOME_PIN_FUNCTIONS = `${GRADLE_PROP_LINE_FUNCTION}
+
+# Run once JAVA_HOME is the build's JDK. Searches the checkout
+# (CIBUILD_SOURCE_DIR, else the current directory) to the depth a nested
+# Gradle project sits at, and prints one line per file it rewrites.
+cibuild_gradle_java_home_pin() {
+  [ -n "\${JAVA_HOME:-}" ] && [ -d "$JAVA_HOME" ] || return 0
+  local root f l v tmp
+  root="\${CIBUILD_SOURCE_DIR:-.}"
+  while IFS= read -r f; do
+    l=$(cibuild_prop_line "$f" org.gradle.java.home)
+    [ -n "$l" ] || continue
+    v="\${l#*	}"
+    [ -n "$v" ] || continue
+    [ -d "$v" ] && continue
+    tmp=$(mktemp)
+    awk -v key=org.gradle.java.home -v home="$JAVA_HOME" '
+      { line = $0; sub(/^[ \\t]+/, "", line) }
+      line !~ /^[#!]/ { k = line; sub(/[ \\t]*[=:].*$/, "", k); if (k == key) { print key "=" home; next } }
+      { print }
+    ' "$f" > "$tmp" && cat "$tmp" > "$f"
+    rm -f "$tmp"
+    echo "Gradle: org.gradle.java.home=$v at \${f#"$root"/}:\${l%%	*} is not on this machine; that line now names this build's JDK, $JAVA_HOME, so every Gradle run in this build uses it (a script's ./gradlew and Xcode's build phases as well as the Gradle steps)."
+  done < <(find "$root" -maxdepth 4 \\( -name .git -o -name node_modules -o -name build -o -name .gradle \\) -prune -o -type f -name gradle.properties -print 2>/dev/null)
+}`;
 //# sourceMappingURL=gradle-memory.js.map

package/dist/src/yaml/steps/gradle-memory.test.js

@@ -67,10 +67,27 @@ describe("cibuild_gradle_memory_plan", () => {
     test("mifos-mobile on its 6 GiB mac guest gets the one heap too", () => {
         writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g\n");
         expect(plan("6144").args).toEqual([
-            "-Dorg.gradle.jvmargs=-Xmx4608m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g",
+            // Its Kotlin daemon inherited the 1g Metaspace cap; in one JVM the cap holds both.
+            "-Dorg.gradle.jvmargs=-Xmx4608m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=2048m",
             "-Pkotlin.compiler.execution.strategy=in-process",
         ]);
     });
+    // GetStream/whatsApp-clone-compose (nightly-baseline 79): Gradle capped at
+    // 512m Metaspace and Kotlin given 1g of its own; in-process, the one JVM
+    // ran out of Metaspace in compileDebugKotlin.
+    test("whatsApp-clone-compose: a Metaspace cap holds Kotlin's too once Kotlin is in-process", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options=-XX:MaxMetaspaceSize=1g -Dlint.nullness.ignore-deprecated=true\n");
+        const p = plan("9933");
+        expect(p.args).toEqual([
+            "-Dorg.gradle.jvmargs=-Xmx7424m -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC -XX:MaxMetaspaceSize=1536m -Dkotlin.daemon.jvm.options=-XX:MaxMetaspaceSize=1g -Dlint.nullness.ignore-deprecated=true",
+            "-Pkotlin.compiler.execution.strategy=in-process",
+        ]);
+        expect(p.line).toContain("with -XX:MaxMetaspaceSize=1536m (Gradle's 512m and Kotlin's 1024m, in one JVM now)");
+    });
+    test("a Kotlin daemon with no Metaspace of its own inherits Gradle's, and the cap doubles", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=1g\n");
+        expect(plan(TEN_GIB).args[0]).toBe("-Dorg.gradle.jvmargs=-Xmx7680m -XX:MaxMetaspaceSize=2048m");
+    });
     test("the one heap never goes below 512 MiB", () => {
         writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx4g\n");
         expect(plan("600").args).toEqual(["-Dorg.gradle.jvmargs=-Xmx512m", "-Pkotlin.compiler.execution.strategy=in-process"]);
@@ -157,6 +174,36 @@ printf 'SENTENCE %s\\n' "$CIBUILD_GRADLE_MEMORY_SENTENCE"`;
 // ReFra was killed again with its heap capped: off-heap memory and parallel
 // native compilers are past what a heap cap bounds. Its CI also sets
 // org.gradle.workers.max=2, which the pipeline carries as max_workers.
+// nightly-baseline 83: SEAbdulbasit/MusicApp-KMP pins its developer's JDK in
+// gradle.properties, and Gradle refused to start.
+describe("cibuild_gradle_java_home_plan", () => {
+    const javaHomePlan = (env) => {
+        const out = execFileSync("bash", ["-c", `${GRADLE_MEMORY_FUNCTIONS}
+CIBUILD_GRADLE_MEMORY_ARGS=()
+cibuild_gradle_java_home_plan gradle.properties "$1/gradle.properties"
+for a in "\${CIBUILD_GRADLE_MEMORY_ARGS[@]}"; do printf 'ARG %s\\n' "$a"; done
+printf 'LINE %s\\n' "$CIBUILD_GRADLE_JAVA_HOME_LINE"`, "plan", join(dir, "no-user-home")], { cwd: dir, encoding: "utf-8", env: { PATH: process.env.PATH ?? "", ...env } });
+        const lines = out.split("\n");
+        return {
+            args: lines.filter((l) => l.startsWith("ARG ")).map((l) => l.slice(4)),
+            line: (lines.find((l) => l.startsWith("LINE ")) ?? "").slice(5),
+        };
+    };
+    test("a pinned JDK that is not on this machine is replaced by the build's", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx2g\norg.gradle.java.home=/Users/abdulbasit/Library/Java/JavaVirtualMachines/corretto-21.0.3/Contents/Home\n");
+        const p = javaHomePlan({ JAVA_HOME: dir });
+        expect(p.args).toEqual([`-Dorg.gradle.java.home=${dir}`]);
+        expect(p.line).toContain("org.gradle.java.home=/Users/abdulbasit/Library/Java/JavaVirtualMachines/corretto-21.0.3/Contents/Home at gradle.properties:2 is not on this machine");
+    });
+    test("a pinned JDK that exists is left alone", () => {
+        writeFileSync(join(dir, "gradle.properties"), `org.gradle.java.home=${dir}\n`);
+        expect(javaHomePlan({ JAVA_HOME: "/elsewhere" }).args).toEqual([]);
+    });
+    test("no pin, nothing", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx2g\n");
+        expect(javaHomePlan({ JAVA_HOME: dir })).toEqual({ args: [], line: "" });
+    });
+});
 describe("cibuild_gradle_workers_plan", () => {
     test("ReFra: the worker count goes after the heap cap, and the sentence names it", () => {
         copyFileSync(join(FIXTURES, "refra.gradle.properties"), join(dir, "gradle.properties"));

package/dist/src/yaml/steps/kotlin-metadata-compiles-on-a-daemon.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=kotlin-metadata-compiles-on-a-daemon.test.d.ts.map

package/dist/src/yaml/steps/kotlin-metadata-compiles-on-a-daemon.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"kotlin-metadata-compiles-on-a-daemon.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/kotlin-metadata-compiles-on-a-daemon.test.ts"],"names":[],"mappings":""}

package/dist/src/yaml/steps/kotlin-metadata-compiles-on-a-daemon.test.js

@@ -0,0 +1,139 @@
+/**
+ * Kotlin metadata compiles run in a Kotlin daemon when the memory plan puts
+ * every other Kotlin compile in-process (nightly-baseline 95).
+ *
+ * DroidKaigi/conference-app-2025 asks for -Xmx6g; on a 6 GiB guest the plan
+ * (nightly-baseline 79) runs one heap and passes
+ * -Pkotlin.compiler.execution.strategy=in-process. With Kotlin 2.2.0, the
+ * in-process :core:common:compileCommonMainKotlinMetadata then failed with
+ * "Context parameters are not supported in K1 mode", while the same task on
+ * the Kotlin daemon passed (measured at the pin, five runs each). So a project
+ * that applies Kotlin Multiplatform gets an init script that sends only its
+ * metadata compiles to a small Kotlin daemon, carved out of the same budget.
+ *
+ * The shell under test is the one that ships: it is executed here.
+ */
+import { execFileSync } from "node:child_process";
+import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { GRADLE_MEMORY_FUNCTIONS, KOTLIN_METADATA_DAEMON_INIT_SCRIPT } from "./gradle-memory.js";
+const FIXTURES = join(dirname(fileURLToPath(import.meta.url)), "../../../test/fixtures/kotlin-metadata-daemon");
+const SIX_GIB = "6144";
+let dir;
+beforeEach(() => {
+    dir = mkdtempSync(join(tmpdir(), "cibuild-kotlin-metadata-"));
+});
+afterEach(() => {
+    rmSync(dir, { recursive: true, force: true });
+});
+function bash(script, args = []) {
+    return execFileSync("bash", ["-c", `${GRADLE_MEMORY_FUNCTIONS}\n${script}`, "t", ...args], {
+        cwd: dir,
+        encoding: "utf-8",
+    });
+}
+/** The shipped plan, as the step runs it, with an init script path for a multiplatform project. */
+function plan(memMib, initScript) {
+    const out = bash(`cibuild_gradle_memory_plan "$1" gradle.properties "$2/gradle.properties" "" "$3"
+for a in "\${CIBUILD_GRADLE_MEMORY_ARGS[@]}"; do printf 'ARG %s\\n' "$a"; done
+printf 'LINE %s\\n' "$CIBUILD_GRADLE_MEMORY_LINE"`, [memMib, join(dir, "no-user-home"), initScript]);
+    const lines = out.split("\n");
+    return {
+        args: lines.filter((l) => l.startsWith("ARG ")).map((l) => l.slice(4)),
+        line: (lines.find((l) => l.startsWith("LINE ")) ?? "").slice(5),
+    };
+}
+describe("a multiplatform project's metadata compiles leave the in-process plan", () => {
+    beforeEach(() => {
+        cpSync(join(FIXTURES, "droidkaigi"), dir, { recursive: true });
+    });
+    test("DroidKaigi on a 6 GiB guest: one Gradle heap, less a small Kotlin daemon for metadata", () => {
+        const p = plan(SIX_GIB, "/x/metadata.init.gradle");
+        // 75 % of 6 GiB is 4608 MiB: 576 of it for the metadata daemon, the rest Gradle's.
+        expect(p.args).toEqual([
+            "-Dorg.gradle.jvmargs=-Xmx4032m -XX:MaxMetaspaceSize=6144m -Dfile.encoding=UTF-8",
+            "-Pkotlin.compiler.execution.strategy=in-process",
+            "-Pkotlin.daemon.jvmargs=-Xmx576m",
+            "--init-script",
+            "/x/metadata.init.gradle",
+        ]);
+        expect(p.line).toContain("Kotlin metadata compiles (compile*KotlinMetadata) in a Kotlin daemon of -Xmx576m");
+    });
+    test("a project that is not multiplatform keeps 79's plan exactly", () => {
+        expect(plan(SIX_GIB, "").args).toEqual([
+            "-Dorg.gradle.jvmargs=-Xmx4608m -XX:MaxMetaspaceSize=6144m -Dfile.encoding=UTF-8",
+            "-Pkotlin.compiler.execution.strategy=in-process",
+        ]);
+    });
+    test("when the heaps fit, nothing is in-process and no init script is passed", () => {
+        expect(plan("32768", "/x/metadata.init.gradle").args).toEqual([]);
+    });
+    test("the metadata daemon's heap grows with the budget, to 1 GiB", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx16g\n");
+        const p = plan("16384", "/x/metadata.init.gradle");
+        expect(p.args).toContain("-Pkotlin.daemon.jvmargs=-Xmx1024m");
+        expect(p.args[0]).toBe("-Dorg.gradle.jvmargs=-Xmx11264m");
+    });
+});
+describe("cibuild_applies_kotlin_multiplatform", () => {
+    test("DroidKaigi's version catalog names the multiplatform plugin", () => {
+        cpSync(join(FIXTURES, "droidkaigi"), dir, { recursive: true });
+        expect(bash("cibuild_applies_kotlin_multiplatform && echo yes || echo no").trim()).toBe("yes");
+    });
+    test('kotlin("multiplatform") in a build script', () => {
+        mkdirSync(join(dir, "shared"));
+        writeFileSync(join(dir, "shared/build.gradle.kts"), 'plugins {\n    kotlin("multiplatform")\n}\n');
+        expect(bash("cibuild_applies_kotlin_multiplatform && echo yes || echo no").trim()).toBe("yes");
+    });
+    test("an Android-only project is not", () => {
+        mkdirSync(join(dir, "app"));
+        writeFileSync(join(dir, "app/build.gradle.kts"), 'plugins {\n    id("com.android.application")\n    kotlin("android")\n}\n');
+        writeFileSync(join(dir, "settings.gradle.kts"), 'include(":app")\n');
+        expect(bash("cibuild_applies_kotlin_multiplatform && echo yes || echo no").trim()).toBe("no");
+    });
+    test("a build directory is not read", () => {
+        mkdirSync(join(dir, "build/tmp"), { recursive: true });
+        writeFileSync(join(dir, "build/tmp/x.gradle.kts"), 'kotlin("multiplatform")\n');
+        expect(bash("cibuild_applies_kotlin_multiplatform && echo yes || echo no").trim()).toBe("no");
+    });
+});
+describe("cibuild_gradle_memory_cap on a multiplatform project", () => {
+    test("writes the init script and runs Gradle with it", () => {
+        cpSync(join(FIXTURES, "droidkaigi"), dir, { recursive: true });
+        const out = bash(`cibuild_mem_mib() { echo ${SIX_GIB}; }
+GRADLE_CMD=./gradlew
+cibuild_gradle_memory_cap '' ''
+for a in "\${CIBUILD_GRADLE_MEMORY_ARGS[@]}"; do printf 'ARG %s\\n' "$a"; done`);
+        const args = out.split("\n").filter((l) => l.startsWith("ARG ")).map((l) => l.slice(4));
+        const at = args.indexOf("--init-script");
+        expect(at).toBeGreaterThan(0);
+        const script = args[at + 1];
+        expect(existsSync(script)).toBe(true);
+        expect(readFileSync(script, "utf-8")).toBe(KOTLIN_METADATA_DAEMON_INIT_SCRIPT);
+        expect(out).toContain("Kotlin metadata compiles (compile*KotlinMetadata) in a Kotlin daemon");
+        rmSync(dirname(script), { recursive: true, force: true });
+    });
+    test("an Android-only project gets no init script", () => {
+        writeFileSync(join(dir, "gradle.properties"), "org.gradle.jvmargs=-Xmx8g\n");
+        const out = bash(`cibuild_mem_mib() { echo ${SIX_GIB}; }
+GRADLE_CMD=./gradlew
+cibuild_gradle_memory_cap '' ''
+for a in "\${CIBUILD_GRADLE_MEMORY_ARGS[@]}"; do printf 'ARG %s\\n' "$a"; done`);
+        expect(out).not.toContain("--init-script");
+        expect(out).toContain("ARG -Pkotlin.compiler.execution.strategy=in-process");
+    });
+});
+describe("the init script", () => {
+    test("touches only the metadata compile task class, through the task's own classloader", () => {
+        expect(KOTLIN_METADATA_DAEMON_INIT_SCRIPT).toContain("org.jetbrains.kotlin.gradle.tasks.KotlinCompileCommon");
+        expect(KOTLIN_METADATA_DAEMON_INIT_SCRIPT).toContain("classLoader.loadClass('org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy')");
+        expect(KOTLIN_METADATA_DAEMON_INIT_SCRIPT).toContain("'DAEMON'");
+    });
+    test("never fails a build: an older Kotlin plugin without the strategy property is left alone", () => {
+        expect(KOTLIN_METADATA_DAEMON_INIT_SCRIPT).toMatch(/catch \(Throwable/);
+        expect(KOTLIN_METADATA_DAEMON_INIT_SCRIPT).not.toContain("${");
+    });
+});
+//# sourceMappingURL=kotlin-metadata-compiles-on-a-daemon.test.js.map

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

@@ -181,10 +181,14 @@ describe('the output_dir input still steers where everything goes', () => {
  * repository has a reason to exclude it.
  */
 describe('derived data is outside the source tree', () => {
+    // The lines that choose the path: the root, then the definition.
     const definitionOf = (script) => {
-        const line = script.split('\n').find((l) => l.startsWith('DERIVED_DATA_PATH='));
-        expect(line).toBeDefined();
-        return line;
+        const lines = script.split('\n');
+        const from = lines.findIndex((l) => l.startsWith('cibuild_dd_root='));
+        const to = lines.findIndex((l) => l.startsWith('DERIVED_DATA_PATH='));
+        expect(from).toBeGreaterThan(-1);
+        expect(to).toBeGreaterThan(from);
+        return lines.slice(from, to + 1).join('\n');
     };
     // Runs the step's own definition line, the way the step would.
     const resolve = (script, env) => execFileSync('bash', ['-c', `${definitionOf(script)}\nprintf '%s' "$DERIVED_DATA_PATH"`], {
@@ -238,11 +242,33 @@ describe('derived data is outside the source tree', () => {
         symlinkSync(real, link);
         const script = await scriptFor(new XcodeBuildStepExecutor(), {});
         const lines = script.split('\n');
-        const from = lines.findIndex((l) => l.startsWith('DERIVED_DATA_PATH='));
+        const from = lines.findIndex((l) => l.startsWith('cibuild_dd_root='));
         const to = lines.findIndex((l) => l.startsWith('echo "Derived data:'));
         const path = execFileSync('bash', ['-c', `set -e\n${lines.slice(from, to).join('\n')}\nprintf '%s' "$DERIVED_DATA_PATH"`], { env: { PATH: process.env.PATH ?? '', TMPDIR: link, OUTPUT_DIR: '/work/repo/build' } }).toString();
         expect(path.startsWith(real + '/')).toBe(true);
     });
+    // nightly-baseline 58, measured on runner-mac-01: xcodebuild folds
+    // /private/tmp back to /tmp and FileManager does not, so LNPopupController's
+    // text-built header paths came out eight characters short under the guest's
+    // /tmp/cibuild-work-<id> root, and built under the user's home.
+    const tmpIsALink = (() => {
+        try {
+            return realpathSync('/tmp') !== '/tmp';
+        }
+        catch {
+            return false;
+        }
+    })();
+    (tmpIsALink ? test : test.skip)('a scratch root under /tmp is traded for the build user\'s home', async () => {
+        const scratch = mkdtempSync('/tmp/cibuild-work-');
+        const home = realpathSync(mkdtempSync(join(tmpdir(), 'home-')));
+        const path = resolve(await scriptFor(new XcodeBuildStepExecutor(), {}), {
+            CIBUILD_SCRATCH: scratch,
+            CIBUILD_USER_HOME: home,
+            OUTPUT_DIR: '/work/repo/build',
+        });
+        expect(path.startsWith(`${home}/Library/Developer/cibuild/cibuild-derived-data/`)).toBe(true);
+    });
     test('the product listing and the xctestrun search follow it', async () => {
         const build = await scriptFor(new XcodeBuildStepExecutor(), {});
         expect(build).toContain('ls -lhR "$DERIVED_DATA_PATH/Build/Products"');

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

@@ -25,16 +25,26 @@ import { refusedFetchHelpers, retryOnRefusedFetch } from './git-fetch-retry.js';
  * 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.
+ * **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)"',

package/package.json

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