@@ -78005,14 +78005,15 @@ function isProbablyGradleDaemonProblem(packageManager, error) {
7800578005"use strict";
7800678006
7800778007Object.defineProperty(exports, "__esModule", ({ value: true }));
78008- exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.MAVEN_NO_TRANSFER_PROGRESS_LONG_FLAG = exports.MAVEN_NO_TRANSFER_PROGRESS_FLAG = exports.MAVEN_ARGS_ENV = exports.INPUT_SHOW_DOWNLOAD_PROGRESS = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_VERIFY_SIGNATURE_PUBLIC_KEY = exports.INPUT_VERIFY_SIGNATURE = exports.INPUT_SET_DEFAULT = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
78008+ exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.MAVEN_NO_TRANSFER_PROGRESS_LONG_FLAG = exports.MAVEN_NO_TRANSFER_PROGRESS_FLAG = exports.MAVEN_ARGS_ENV = exports.INPUT_SHOW_DOWNLOAD_PROGRESS = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_VERIFY_SIGNATURE_PUBLIC_KEY = exports.INPUT_VERIFY_SIGNATURE = exports.INPUT_SET_DEFAULT = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE_DEPRECATED = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
7800978009exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
7801078010exports.INPUT_JAVA_VERSION = 'java-version';
7801178011exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
7801278012exports.INPUT_ARCHITECTURE = 'architecture';
7801378013exports.INPUT_JAVA_PACKAGE = 'java-package';
7801478014exports.INPUT_DISTRIBUTION = 'distribution';
78015- exports.INPUT_JDK_FILE = 'jdkFile';
78015+ exports.INPUT_JDK_FILE = 'jdk-file';
78016+ exports.INPUT_JDK_FILE_DEPRECATED = 'jdkFile';
7801678017exports.INPUT_CHECK_LATEST = 'check-latest';
7801778018exports.INPUT_SET_DEFAULT = 'set-default';
7801878019exports.INPUT_VERIFY_SIGNATURE = 'verify-signature';
@@ -81272,7 +81273,11 @@ class ZuluDistribution extends base_installer_1.JavaBase {
8127281273 case 'x64':
8127381274 return 'x64';
8127481275 case 'x86':
81275- return 'x86';
81276+ // The Azul Metadata API's "x86" value returns both 32-bit (i686) and
81277+ // 64-bit (x64) packages, which are indistinguishable by version and
81278+ // would let a 32-bit request resolve to a 64-bit JDK. Use "i686" to
81279+ // target only genuine 32-bit builds, matching the legacy API behavior.
81280+ return 'i686';
8127681281 case 'aarch64':
8127781282 case 'arm64':
8127881283 return 'aarch64';
@@ -81583,7 +81588,7 @@ function run() {
8158381588 const versionFile = core.getInput(constants.INPUT_JAVA_VERSION_FILE);
8158481589 const architecture = core.getInput(constants.INPUT_ARCHITECTURE);
8158581590 const packageType = core.getInput(constants.INPUT_JAVA_PACKAGE);
81586- const jdkFile = core.getInput(constants.INPUT_JDK_FILE );
81591+ const jdkFile = getJdkFileInput( );
8158781592 const cache = core.getInput(constants.INPUT_CACHE);
8158881593 const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
8158981594 const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
@@ -81662,6 +81667,14 @@ function run() {
8166281667 });
8166381668}
8166481669run();
81670+ function getJdkFileInput() {
81671+ const jdkFile = core.getInput(constants.INPUT_JDK_FILE);
81672+ const deprecatedJdkFile = core.getInput(constants.INPUT_JDK_FILE_DEPRECATED);
81673+ if (deprecatedJdkFile) {
81674+ core.warning(`The '${constants.INPUT_JDK_FILE_DEPRECATED}' input is deprecated and may be removed in a future release. Please use '${constants.INPUT_JDK_FILE}' instead.`);
81675+ }
81676+ return jdkFile || deprecatedJdkFile;
81677+ }
8166581678function installVersion(version, options, toolchainId = 0) {
8166681679 return __awaiter(this, void 0, void 0, function* () {
8166781680 const { distributionName, jdkFile, architecture, packageType, checkLatest, setDefault, verifySignature, verifySignaturePublicKey, toolchainIds } = options;
@@ -82027,16 +82040,18 @@ function isCacheFeatureAvailable() {
8202782040}
8202882041exports.isCacheFeatureAvailable = isCacheFeatureAvailable;
8202982042function getVersionFromFileContent(content, distributionName, versionFile) {
82030- var _a, _b, _c;
82043+ var _a, _b, _c, _d ;
8203182044 let javaVersionRegExp;
8203282045 let extractedDistribution;
8203382046 function getFileName(versionFile) {
8203482047 return path_1.default.basename(versionFile);
8203582048 }
8203682049 const versionFileName = getFileName(versionFile);
8203782050 if (versionFileName == '.tool-versions') {
82051+ // Capture an optional asdf-java vendor prefix (e.g. `temurin-`, `corretto-`)
82052+ // in the `distribution` group so it can be mapped to a setup-java distribution.
8203882053 javaVersionRegExp =
82039- /^java\s+(?:\S*-)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
82054+ /^java\s+(?:(?<distribution> \S*) -)?(?<version>\d+(?:\.\d+)*([+_.-](?:openj9[-._]?\d[\w.-]*|java\d+|jre[-_\w]*|OpenJDK\d+[\w_.-]*|[a-z0-9]+))*)/im;
8204082055 }
8204182056 else if (versionFileName == '.sdkmanrc') {
8204282057 // Match both version and optional distribution identifier
@@ -82056,6 +82071,14 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
8205682071 extractedDistribution = mapSdkmanDistribution(sdkmanDist);
8205782072 core.debug(`Parsed distribution '${extractedDistribution}' from SDKMAN identifier '${sdkmanDist}'`);
8205882073 }
82074+ // Extract distribution from asdf .tool-versions file
82075+ if (versionFileName == '.tool-versions' && ((_c = match === null || match === void 0 ? void 0 : match.groups) === null || _c === void 0 ? void 0 : _c.distribution)) {
82076+ const asdfDist = match.groups.distribution;
82077+ extractedDistribution = mapAsdfDistribution(asdfDist);
82078+ if (extractedDistribution) {
82079+ core.debug(`Parsed distribution '${extractedDistribution}' from asdf identifier '${asdfDist}'`);
82080+ }
82081+ }
8205982082 core.debug(`Parsed version '${capturedVersion}' from file '${versionFileName}'`);
8206082083 if (!capturedVersion) {
8206182084 return null;
@@ -82072,7 +82095,7 @@ function getVersionFromFileContent(content, distributionName, versionFile) {
8207282095 // Apply DISTRIBUTIONS_ONLY_MAJOR_VERSION logic whenever the effective distribution
8207382096 // (either explicitly provided or extracted from the version file) is in the list.
8207482097 if (constants_1.DISTRIBUTIONS_ONLY_MAJOR_VERSION.includes(extractedDistribution || distributionName)) {
82075- const coerceVersion = (_c = semver.coerce(version)) !== null && _c !== void 0 ? _c : version;
82098+ const coerceVersion = (_d = semver.coerce(version)) !== null && _d !== void 0 ? _d : version;
8207682099 version = semver.major(coerceVersion).toString();
8207782100 }
8207882101 return {
@@ -82105,6 +82128,43 @@ function mapSdkmanDistribution(sdkmanDist) {
8210582128 }
8210682129 return mapped;
8210782130}
82131+ // Map asdf-java (.tool-versions) vendor identifiers to setup-java distribution names.
82132+ // asdf-java encodes the vendor as a prefix on the version string, e.g.
82133+ // `java temurin-17.0.3+7` or `java semeru-openj9-11.0.25+9`. Packaging variants
82134+ // (`-jre`, `-musl`, `-openj9`, `-crac`, `-javafx`, ...) are collapsed onto the
82135+ // base vendor since setup-java does not distinguish them here.
82136+ function mapAsdfDistribution(asdfDist) {
82137+ const normalized = asdfDist.toLowerCase();
82138+ // Multi-segment vendors that map to a distinct setup-java distribution.
82139+ if (normalized.startsWith('graalvm-community')) {
82140+ return 'graalvm-community';
82141+ }
82142+ if (normalized.startsWith('oracle-graalvm')) {
82143+ return 'graalvm';
82144+ }
82145+ const baseVendor = normalized.split('-')[0];
82146+ const distributionMap = {
82147+ temurin: 'temurin',
82148+ adoptopenjdk: 'temurin',
82149+ zulu: 'zulu',
82150+ corretto: 'corretto',
82151+ liberica: 'liberica',
82152+ microsoft: 'microsoft',
82153+ semeru: 'semeru',
82154+ ibm: 'semeru',
82155+ dragonwell: 'dragonwell',
82156+ graalvm: 'graalvm',
82157+ oracle: 'oracle',
82158+ sapmachine: 'sapmachine',
82159+ kona: 'kona',
82160+ jetbrains: 'jetbrains'
82161+ };
82162+ const mapped = distributionMap[baseVendor];
82163+ if (!mapped) {
82164+ core.warning(`Unknown asdf distribution identifier '${asdfDist}'. Please specify the distribution explicitly.`);
82165+ }
82166+ return mapped;
82167+ }
8210882168// By convention, action expects version 8 in the format `8.*` instead of `1.8`
8210982169function avoidOldNotation(content) {
8211082170 return content.startsWith('1.') ? content.substring(2) : content;
0 commit comments