mirror of
https://github.com/actions/setup-java.git
synced 2026-08-30 12:33:43 +01:00
Resolve legacy OpenJDK build metadata
This commit is contained in:
committed by
GitHub
parent
cb48866ec3
commit
333d9ce35a
@@ -126,7 +126,9 @@ export class OpenJdkDistribution extends JavaBase {
|
||||
|
||||
return Array.from(html.matchAll(pattern), match => {
|
||||
const url = match[1];
|
||||
const build = url.match(/\/(\d+)\/(?:GPL\/)?openjdk-/)?.[1];
|
||||
const build =
|
||||
url.match(/\/(\d+)\/(?:GPL\/)?openjdk-/)?.[1] ??
|
||||
this.findBuildInArchiveHeading(html, match.index, match[2]);
|
||||
return {
|
||||
version: this.toSemver(match[2], build),
|
||||
url
|
||||
@@ -134,6 +136,23 @@ export class OpenJdkDistribution extends JavaBase {
|
||||
});
|
||||
}
|
||||
|
||||
private findBuildInArchiveHeading(
|
||||
html: string,
|
||||
assetIndex: number,
|
||||
version: string
|
||||
): string | undefined {
|
||||
const headings = Array.from(
|
||||
html.slice(0, assetIndex).matchAll(/\(build\s+([^)]+)\)/g)
|
||||
);
|
||||
const headingVersion = headings.at(-1)?.[1];
|
||||
if (!headingVersion) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const [javaVersion, build] = headingVersion.split('+');
|
||||
return javaVersion === version ? build : undefined;
|
||||
}
|
||||
|
||||
private toSemver(version: string, urlBuild?: string): string {
|
||||
const [javaVersion, filenameBuild] = version.replace('-ea', '').split('+');
|
||||
const versionParts = javaVersion.split('.');
|
||||
|
||||
Reference in New Issue
Block a user