@invarn/cibuild 2.6.7 → 2.6.9

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

@@ -8,7 +8,7 @@
 // for one never runs on a runner.
 import { existsSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
-import { BaseStepExecutor } from './base.js';
+import { BaseStepExecutor, javaHomeVersionSpec } from './base.js';
 /**
  * Set Java version step executor
  * Sets the Java version to use for Android builds
@@ -72,14 +72,17 @@ export class SetJavaVersionStepExecutor extends BaseStepExecutor {
         }
         // Try java_home utility on macOS
         if (process.platform === 'darwin') {
+            // java_home wants `1.8` for Java 8, and answers a wrong request with the
+            // newest JDK rather than an error -- see javaHomeVersionSpec.
+            const spec = javaHomeVersionSpec(version);
             try {
-                execSync(`/usr/libexec/java_home -v "${version}"`, { stdio: 'pipe' });
+                execSync(`/usr/libexec/java_home -v "${spec}"`, { stdio: 'pipe' });
                 return { passed: true, message: `Java ${version} is available` };
             }
             catch {
                 // Try with pattern
                 try {
-                    execSync(`/usr/libexec/java_home -v "${version}.*"`, { stdio: 'pipe' });
+                    execSync(`/usr/libexec/java_home -v "${spec}.*"`, { stdio: 'pipe' });
                     return { passed: true, message: `Java ${version} is available` };
                 }
                 catch {
@@ -167,10 +170,19 @@ export class SetJavaVersionStepExecutor extends BaseStepExecutor {
         commands.push('fi');
         commands.push('');
         commands.push('# 4. macOS java_home utility');
+        commands.push('# java_home matches Java 8 only as 1.8 (it predates JEP 223), and it is');
+        commands.push('# permissive: an unmatched -v N returns the NEWEST JDK >= N instead of');
+        commands.push('# failing. Asking as "8" therefore does not miss, it silently returns the');
+        commands.push('# wrong JDK -- measured as OpenJDK 25 on an image where Corretto 8 was');
+        commands.push('# installed and found correctly by -v 1.8.');
+        commands.push('JAVA_HOME_SPEC="$JAVA_VERSION"');
+        commands.push('case "$JAVA_VERSION" in');
+        commands.push('  1|2|3|4|5|6|7|8) JAVA_HOME_SPEC="1.$JAVA_VERSION" ;;');
+        commands.push('esac');
         commands.push('if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then');
-        commands.push('  JAVA_HOME=$(/usr/libexec/java_home -v "$JAVA_VERSION" 2>/dev/null || true)');
+        commands.push('  JAVA_HOME=$(/usr/libexec/java_home -v "$JAVA_HOME_SPEC" 2>/dev/null || true)');
         commands.push('  if [ -z "$JAVA_HOME" ]; then');
-        commands.push('    JAVA_HOME=$(/usr/libexec/java_home -v "${JAVA_VERSION}.*" 2>/dev/null || true)');
+        commands.push('    JAVA_HOME=$(/usr/libexec/java_home -v "${JAVA_HOME_SPEC}.*" 2>/dev/null || true)');
         commands.push('  fi');
         commands.push('  if [ -n "$JAVA_HOME" ]; then');
         commands.push('    echo "Found Java at: $JAVA_HOME (java_home)"');
@@ -340,9 +352,14 @@ export class GradleBuildStepExecutor extends BaseStepExecutor {
         commands.push('      fi');
         commands.push('    # Try macOS java_home utility for specific version');
         commands.push('    elif [ -x "/usr/libexec/java_home" ]; then');
-        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}" 2>/dev/null || true)');
+        commands.push('      # java_home names Java 8 as 1.8, and answers an unmatched request');
+        commands.push('      # with the newest JDK rather than failing -- ask the right way or');
+        commands.push('      # silently get the wrong JDK.');
+        commands.push('      REQ_SPEC="$REQUESTED_VERSION"');
+        commands.push('      case "$REQUESTED_VERSION" in 1|2|3|4|5|6|7|8) REQ_SPEC="1.$REQUESTED_VERSION" ;; esac');
+        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "$REQ_SPEC" 2>/dev/null || true)');
         commands.push('      if [ -z "$DETECTED_JAVA_HOME" ]; then');
-        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}.*" 2>/dev/null || true)');
+        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQ_SPEC}.*" 2>/dev/null || true)');
         commands.push('      fi');
         commands.push('      if [ -n "$DETECTED_JAVA_HOME" ]; then');
         commands.push('        echo "✅ Found Java $REQUESTED_VERSION at: $DETECTED_JAVA_HOME (java_home utility)"');
@@ -499,6 +516,81 @@ export class GradleBuildStepExecutor extends BaseStepExecutor {
  * Android lint step executor
  * Runs Android lint checks
  */
+/**
+ * Bash that picks a real variant task out of Gradle's own ambiguity error.
+ *
+ * `android/nowinandroid` declares its product flavors as an enum in
+ * `build-logic/convention/…/NiaFlavor.kt` and applies them through a
+ * convention plugin, so `app/build.gradle.kts` has no `productFlavors {}`
+ * block for the literal scan to find. `VARIANT` stayed `debug` and Gradle
+ * refused the very first Android step:
+ *
+ *   Cannot locate tasks that match ':app:lintDebug' as task 'lintDebug' is
+ *   ambiguous in project ':app'. Candidates are: 'lintDemoDebug',
+ *   'lintProdDebug', …
+ *
+ * Gradle has just listed the answer. Reading it back costs one extra
+ * invocation on the failing case and nothing at all on a flavourless project,
+ * which is why this is the fallback rather than an up-front `tasks --all`.
+ *
+ * Written as a shell function so what ships is what the test runs.
+ */
+export const PICK_VARIANT_TASK_FUNCTION = `cibuild_pick_variant_task() {
+  # $1 task prefix (lint, test), $2 task suffix (empty, UnitTest),
+  # $3 the build type to prefer (Debug). Gradle's output arrives on stdin.
+  awk '/Candidates are:/ { sub(/.*Candidates are:/, ""); print; exit }' |
+    tr ',' '\\n' |
+    tr -d " '\\"." |
+    grep -E "^\${1}[A-Za-z0-9]*\${3}\${2}$" |
+    head -1
+}`;
+/**
+ * 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.
+ *
+ * The resolved variant is exported with `envman`, so the *other*
+ * variant-specific step in the same pipeline does not repeat the discovery —
+ * whichever of lint and unit tests runs first pays for it.
+ */
+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 args = gradleArgs === '' ? '' : ` ${gradleArgs}`;
+    return [
+        '',
+        PICK_VARIANT_TASK_FUNCTION,
+        '',
+        `VARIANT_LOG=$(mktemp)`,
+        'set +e',
+        `$GRADLE_CMD ${task}${args} 2>&1 | tee "$VARIANT_LOG"`,
+        'VARIANT_STATUS=${PIPESTATUS[0]}',
+        'set -e',
+        '',
+        'if [ "$VARIANT_STATUS" -ne 0 ] && grep -q "is ambiguous in project" "$VARIANT_LOG"; then',
+        `  echo ""`,
+        `  echo "Gradle says ${task} is ambiguous, so this project has product flavors the pipeline did not know about."`,
+        `  BUILD_TYPE_WANTED="\${BUILD_TYPE:-${capitalized}}"`,
+        `  RESOLVED_TASK=$(cibuild_pick_variant_task "${prefix}" "${suffix}" "$BUILD_TYPE_WANTED" < "$VARIANT_LOG")`,
+        '  if [ -z "$RESOLVED_TASK" ]; then',
+        '    echo "None of the candidates Gradle listed ends in $BUILD_TYPE_WANTED, so there is nothing safe to retry with."',
+        '    rm -f "$VARIANT_LOG"',
+        '    exit "$VARIANT_STATUS"',
+        '  fi',
+        `  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"`,
+        // 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}`,
+        'elif [ "$VARIANT_STATUS" -ne 0 ]; then',
+        '  rm -f "$VARIANT_LOG"',
+        '  exit "$VARIANT_STATUS"',
+        'fi',
+        'rm -f "$VARIANT_LOG"',
+    ];
+}
 export class AndroidLintStepExecutor extends BaseStepExecutor {
     getValidationRequirements(_inputs, env, _config) {
         return [
@@ -559,9 +651,14 @@ export class AndroidLintStepExecutor extends BaseStepExecutor {
         commands.push('      fi');
         commands.push('    # Try macOS java_home utility for specific version');
         commands.push('    elif [ -x "/usr/libexec/java_home" ]; then');
-        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}" 2>/dev/null || true)');
+        commands.push('      # java_home names Java 8 as 1.8, and answers an unmatched request');
+        commands.push('      # with the newest JDK rather than failing -- ask the right way or');
+        commands.push('      # silently get the wrong JDK.');
+        commands.push('      REQ_SPEC="$REQUESTED_VERSION"');
+        commands.push('      case "$REQUESTED_VERSION" in 1|2|3|4|5|6|7|8) REQ_SPEC="1.$REQUESTED_VERSION" ;; esac');
+        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "$REQ_SPEC" 2>/dev/null || true)');
         commands.push('      if [ -z "$DETECTED_JAVA_HOME" ]; then');
-        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}.*" 2>/dev/null || true)');
+        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQ_SPEC}.*" 2>/dev/null || true)');
         commands.push('      fi');
         commands.push('      if [ -n "$DETECTED_JAVA_HOME" ]; then');
         commands.push('        echo "✅ Found Java $REQUESTED_VERSION at: $DETECTED_JAVA_HOME (java_home utility)"');
@@ -662,8 +759,13 @@ export class AndroidLintStepExecutor extends BaseStepExecutor {
         commands.push('');
         commands.push('# Run lint');
         const variantCapitalized = variant.charAt(0).toUpperCase() + variant.slice(1);
-        const lintTask = `:${this.escapeBash(module)}:lint${variantCapitalized}`;
-        commands.push(`$GRADLE_CMD ${lintTask}`);
+        commands.push(...variantTaskCommands({
+            module,
+            variant,
+            prefix: 'lint',
+            suffix: '',
+            escape: (value) => this.escapeBash(value),
+        }));
         commands.push('');
         commands.push('# Lint completed');
         commands.push('echo "Lint analysis completed successfully"');
@@ -738,9 +840,14 @@ export class AndroidUnitTestStepExecutor extends BaseStepExecutor {
         commands.push('      fi');
         commands.push('    # Try macOS java_home utility for specific version');
         commands.push('    elif [ -x "/usr/libexec/java_home" ]; then');
-        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}" 2>/dev/null || true)');
+        commands.push('      # java_home names Java 8 as 1.8, and answers an unmatched request');
+        commands.push('      # with the newest JDK rather than failing -- ask the right way or');
+        commands.push('      # silently get the wrong JDK.');
+        commands.push('      REQ_SPEC="$REQUESTED_VERSION"');
+        commands.push('      case "$REQUESTED_VERSION" in 1|2|3|4|5|6|7|8) REQ_SPEC="1.$REQUESTED_VERSION" ;; esac');
+        commands.push('      DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "$REQ_SPEC" 2>/dev/null || true)');
         commands.push('      if [ -z "$DETECTED_JAVA_HOME" ]; then');
-        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQUESTED_VERSION}.*" 2>/dev/null || true)');
+        commands.push('        DETECTED_JAVA_HOME=$(/usr/libexec/java_home -v "${REQ_SPEC}.*" 2>/dev/null || true)');
         commands.push('      fi');
         commands.push('      if [ -n "$DETECTED_JAVA_HOME" ]; then');
         commands.push('        echo "✅ Found Java $REQUESTED_VERSION at: $DETECTED_JAVA_HOME (java_home utility)"');
@@ -841,13 +948,19 @@ export class AndroidUnitTestStepExecutor extends BaseStepExecutor {
         commands.push('');
         commands.push('# Run unit tests');
         const variantCapitalized = variant.charAt(0).toUpperCase() + variant.slice(1);
-        const testTask = `:${this.escapeBash(module)}:test${variantCapitalized}UnitTest`;
-        let gradleCmd = `$GRADLE_CMD ${testTask}`;
         // Add test filter if specified
+        let gradleArgs = '';
         if (testFilter && testFilter.trim() !== '') {
-            gradleCmd += ` --tests '${this.escapeBash(testFilter)}'`;
+            gradleArgs = `--tests '${this.escapeBash(testFilter)}'`;
         }
-        commands.push(gradleCmd);
+        commands.push(...variantTaskCommands({
+            module,
+            variant,
+            prefix: 'test',
+            suffix: 'UnitTest',
+            gradleArgs,
+            escape: (value) => this.escapeBash(value),
+        }));
         commands.push('');
         commands.push('# Tests completed');
         commands.push('echo "Unit tests completed successfully"');

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

@@ -3,6 +3,26 @@
  */
 import type { StepDef, CIConfig } from '../../types.js';
 import type { ValidationRequirement, ValidationCheckResult, ValidationCategory, StepOutput } from '../validation-types.js';
+/**
+ * The version string `/usr/libexec/java_home -v` expects for a JDK major.
+ *
+ * Java 8 predates JEP 223 and calls itself `1.8.0_x`, so java_home matches it
+ * only as `1.8` — `-v 8` does not match it. That would be a harmless miss if
+ * java_home then failed, but **it is permissive**: an unmatched `-v N` returns
+ * the newest JDK that is >= N instead of erroring. Asking the wrong way does
+ * not report "not found"; it silently hands back the wrong JDK.
+ *
+ * Measured on macOS 15.7.3 inside the runner image, with Corretto 8 and
+ * OpenJDK 25 both installed:
+ *
+ *     -v 8    -> OpenJDK 25.0.2      wrong, and reported as success
+ *     -v 1.8  -> Amazon Corretto 8   right
+ *
+ * Without this, a Gradle 4.x project — the only kind that ever selects Java 8,
+ * because selection takes the newest JDK the wrapper allows — would be handed
+ * JDK 25 and fail for a reason with nothing to do with its own configuration.
+ */
+export declare function javaHomeVersionSpec(version: string | number): string;
 /**
  * Context provided to step executors
  */

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

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/base.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,KAAK,EACV,qBAAqB,EACrB,qBAAqB,EACrB,kBAAkB,EAClB,UAAU,EACX,MAAM,wBAAwB,CAAC;AAEhC;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAEtF;;;;;;;OAOG;IACH,yBAAyB,CAAC,CACxB,MAAM,EAAE,GAAG,EACX,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,MAAM,EAAE,QAAQ,GACf,qBAAqB,EAAE,CAAC;IAE3B;;;;OAIG;IACH,UAAU,CAAC,IAAI,UAAU,EAAE,CAAC;IAE5B;;;OAGG;IACH,oBAAoB,CAAC,IAAI,OAAO,CAAC;CAClC;AAED;;GAEG;AACH,8BAAsB,gBAAiB,YAAW,YAAY;IAC5D;;OAEG;IACH,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAE9F;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAUjE;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IASjE;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAS/D;;;;;OAKG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAS/D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,GAAG,CAAC;IAOnE;;;;;;;OAOG;IACH,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,GAAG;IAS3E;;;;OAIG;IACH,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAKzC;;;;;;OAMG;IACH,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM;IAgB7E;;;;;;OAMG;IACH,SAAS,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM;IA0B3E;;;;;OAKG;IACH,SAAS,CAAC,4BAA4B,CACpC,QAAQ,EAAE,MAAM,EAAE,EAClB,QAAQ,EAAE,MAAM,GACf,MAAM;IAQT;;;OAGG;IACH,yBAAyB,CACvB,OAAO,EAAE,GAAG,EACZ,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC5B,OAAO,EAAE,QAAQ,GAChB,qBAAqB,EAAE;IAI1B;;;OAGG;IACH,UAAU,IAAI,UAAU,EAAE;IAI1B;;;;OAIG;IACH,oBAAoB,IAAI,OAAO;IAI/B;;;OAGG;IACH,SAAS,CAAC,cAAc,CACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,GACZ,qBAAqB;IAYxB;;;OAGG;IACH,SAAS,CAAC,aAAa,CACrB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,qBAAqB;IAiBxB;;;OAGG;IACH,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,GACZ,qBAAqB;IAiBxB;;;OAGG;IACH,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,GACZ,qBAAqB;IAiBxB;;;OAGG;IACH,SAAS,CAAC,YAAY,CACpB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,GAAG,EACX,WAAW,EAAE,MAAM,EACnB,IAAI,CAAC,EAAE,MAAM,GACZ,qBAAqB;IAiBxB;;;OAGG;IACH,SAAS,CAAC,kBAAkB,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,kBAA2B,EACrC,UAAU,CAAC,EAAE,MAAM,GAClB,qBAAqB;IAWxB;;;OAGG;cACa,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAiBnF;;;OAGG;cACa,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;CA2BlF;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,wEAAwE;IACxE,SAAS,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,MAAM,CAAC;IACvD;;;;OAIG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;;;;GAKG;AACH,MAAM,MAAM,YAAY,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAC;AAErD;;GAEG;AACH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;OAGG;IACH,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,MAAM,CAAC,EAAE;QACP,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB,CAAC;KAClC,CAAC;CACH"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/base.ts"],"names":[],"mappings":"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"}

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

@@ -3,6 +3,29 @@
  */
 import { execSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
+/**
+ * The version string `/usr/libexec/java_home -v` expects for a JDK major.
+ *
+ * Java 8 predates JEP 223 and calls itself `1.8.0_x`, so java_home matches it
+ * only as `1.8` — `-v 8` does not match it. That would be a harmless miss if
+ * java_home then failed, but **it is permissive**: an unmatched `-v N` returns
+ * the newest JDK that is >= N instead of erroring. Asking the wrong way does
+ * not report "not found"; it silently hands back the wrong JDK.
+ *
+ * Measured on macOS 15.7.3 inside the runner image, with Corretto 8 and
+ * OpenJDK 25 both installed:
+ *
+ *     -v 8    -> OpenJDK 25.0.2      wrong, and reported as success
+ *     -v 1.8  -> Amazon Corretto 8   right
+ *
+ * Without this, a Gradle 4.x project — the only kind that ever selects Java 8,
+ * because selection takes the newest JDK the wrapper allows — would be handed
+ * JDK 25 and fail for a reason with nothing to do with its own configuration.
+ */
+export function javaHomeVersionSpec(version) {
+    const major = Number(version);
+    return Number.isInteger(major) && major > 0 && major < 9 ? `1.${major}` : String(version);
+}
 /**
  * Base class for step executors providing common utilities
  */
@@ -323,7 +346,7 @@ ${scriptContent}
         try {
             if (process.platform === 'darwin') {
                 // macOS: use java_home
-                execSync(`/usr/libexec/java_home -v "${version}"`, { stdio: 'pipe' });
+                execSync(`/usr/libexec/java_home -v "${javaHomeVersionSpec(version)}"`, { stdio: 'pipe' });
             }
             else {
                 // Linux: check common paths

package/dist/src/yaml/steps/java-home-version-spec.test.d.ts

@@ -0,0 +1,10 @@
+/**
+ * `/usr/libexec/java_home -v` is permissive, so asking it the wrong way does
+ * not fail — it returns the wrong JDK and reports success. These tests pin the
+ * one version where the spec differs from the major.
+ *
+ * Measured on macOS 15.7.3 in the runner image with Corretto 8 and OpenJDK 25
+ * both installed:  `-v 8` -> OpenJDK 25.0.2,  `-v 1.8` -> Amazon Corretto 8.
+ */
+export {};
+//# sourceMappingURL=java-home-version-spec.test.d.ts.map

package/dist/src/yaml/steps/java-home-version-spec.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"java-home-version-spec.test.d.ts","sourceRoot":"","sources":["../../../../src/yaml/steps/java-home-version-spec.test.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}

package/dist/src/yaml/steps/java-home-version-spec.test.js

@@ -0,0 +1,58 @@
+/**
+ * `/usr/libexec/java_home -v` is permissive, so asking it the wrong way does
+ * not fail — it returns the wrong JDK and reports success. These tests pin the
+ * one version where the spec differs from the major.
+ *
+ * Measured on macOS 15.7.3 in the runner image with Corretto 8 and OpenJDK 25
+ * both installed:  `-v 8` -> OpenJDK 25.0.2,  `-v 1.8` -> Amazon Corretto 8.
+ */
+import { describe, test, expect } from '@jest/globals';
+import { javaHomeVersionSpec } from './base.js';
+import { SetJavaVersionStepExecutor } from './android.js';
+describe('javaHomeVersionSpec', () => {
+    test('Java 8 is asked for as 1.8, not 8', () => {
+        expect(javaHomeVersionSpec(8)).toBe('1.8');
+        expect(javaHomeVersionSpec('8')).toBe('1.8');
+    });
+    test('every JDK from 9 up is asked for by its major', () => {
+        for (const v of [9, 11, 17, 21, 24, 25]) {
+            expect(javaHomeVersionSpec(v)).toBe(String(v));
+        }
+    });
+    test('the legacy 1.x scheme covers every pre-9 major', () => {
+        expect(javaHomeVersionSpec(7)).toBe('1.7');
+        expect(javaHomeVersionSpec(6)).toBe('1.6');
+    });
+    test('a non-numeric version is passed through untouched', () => {
+        expect(javaHomeVersionSpec('zulu-8')).toBe('zulu-8');
+        expect(javaHomeVersionSpec('')).toBe('');
+    });
+});
+describe('set-java-version generates a java_home request that can find Java 8', () => {
+    const script = async (javaVersion) => {
+        const executor = new SetJavaVersionStepExecutor();
+        const step = await executor.execute({ java_version: javaVersion }, { workingDir: '/repo', env: {} }, { artifactsDir: '/ci/artifacts' });
+        return step.script;
+    };
+    test('the generated script maps a pre-9 major onto the 1.x java_home name', async () => {
+        const s = await script('8');
+        expect(s).toContain('JAVA_HOME_SPEC="1.$JAVA_VERSION"');
+        expect(s).toContain('1|2|3|4|5|6|7|8)');
+    });
+    test('java_home is never asked for the bare major', async () => {
+        // This is the whole bug: `-v 8` does not miss, it returns the newest JDK.
+        for (const v of ['8', '17', '25']) {
+            const s = await script(v);
+            expect(s).toContain('java_home -v "$JAVA_HOME_SPEC"');
+            expect(s).not.toContain('java_home -v "$JAVA_VERSION"');
+            expect(s).not.toContain('java_home -v "${JAVA_VERSION}.*"');
+        }
+    });
+    test('the recovery path also asks by spec, not by bare major', async () => {
+        const s = await script('8');
+        if (s.includes('REQUESTED_VERSION')) {
+            expect(s).not.toContain('java_home -v "${REQUESTED_VERSION}"');
+        }
+    });
+});
+//# sourceMappingURL=java-home-version-spec.test.js.map

package/package.json

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