actions/setup-java
1
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2026-11-14 13:10:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Microsoft OpenJDK 25.0.5.0.2 support (#1320)

Browse Source 
* Initial plan

* Support Microsoft OpenJDK 25.0.5.0.2 with bundled manifest fallback

* Fix Microsoft OpenJDK version matching

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Bruno Borges <brborges@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
Copilot
2026-11-13 23:30:44 -05:00
committed by GitHub
co-authored by Copilot App copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Bruno Borges
parent a3c8068301
commit a1bf0b5568
9 changed files with 586 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/distributions/microsoft/installer.ts
+16 -1
View File
@@ -8,10 +8,12 @@ import {
cacheJdkDir,
extractJdkFile,
getDownloadArchiveExtension,
normalizeJavaVersionToSemver,
renameWinArchive
} from '../../util.js';
import * as gpg from '../../gpg.js';
import {MICROSOFT_PUBLIC_KEY} from './microsoft-key.js';
import bundledVersions from './microsoft-openjdk-versions.json' with {type: 'json'};
import {SIGNATURE_VERIFICATION_FAILURE_HELP} from '../../constants.js';
import * as core from '@actions/core';
import * as tc from '@actions/tool-cache';
@@ -108,7 +110,20 @@ export class MicrosoftDistributions extends JavaBase {
throw new Error('Could not load manifest for Microsoft Build of OpenJDK');
}
const foundRelease = await tc.findFromManifest(range, true, manifest, arch);
const findMatchingRelease = async (releases: tc.IToolRelease[]) => {
const matchingReleases = releases
.map(release => ({
...release,
version: normalizeJavaVersionToSemver(release.version)
}))
.filter(release => this.isVersionSatisfied(range, release.version));
return tc.findFromManifest(range, true, matchingReleases, arch);
};
const foundRelease =
(await findMatchingRelease(manifest)) ??
(await findMatchingRelease(bundledVersions));
if (!foundRelease) {
const availableVersionStrings = manifest.map(item => item.version);
src/distributions/microsoft/microsoft-openjdk-versions.json
+43
View File
@@ -1,4 +1,47 @@
[
{
"version": "25.0.5+0.2",
"stable": true,
"release_url": "https://aka.ms/download-jdk",
"files": [
{
"filename": "microsoft-jdk-25.0.5.0.2-macos-x64.tar.gz",
"arch": "x64",
"platform": "darwin",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-macos-x64.tar.gz"
},
{
"filename": "microsoft-jdk-25.0.5.0.2-linux-x64.tar.gz",
"arch": "x64",
"platform": "linux",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-linux-x64.tar.gz"
},
{
"filename": "microsoft-jdk-25.0.5.0.2-windows-x64.zip",
"arch": "x64",
"platform": "win32",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-windows-x64.zip"
},
{
"filename": "microsoft-jdk-25.0.5.0.2-macos-aarch64.tar.gz",
"arch": "aarch64",
"platform": "darwin",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-macos-aarch64.tar.gz"
},
{
"filename": "microsoft-jdk-25.0.5.0.2-linux-aarch64.tar.gz",
"arch": "aarch64",
"platform": "linux",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-linux-aarch64.tar.gz"
},
{
"filename": "microsoft-jdk-25.0.5.0.2-windows-aarch64.zip",
"arch": "aarch64",
"platform": "win32",
"download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.5.0.2-windows-aarch64.zip"
}
]
},
{
"version": "25.0.3",
"stable": true,