graalvm/setup-graalvm
1
0
Fork 0
mirror of https://github.com/graalvm/setup-graalvm.git synced 2025-02-24 04:50:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use 22.3.1 when java-version set to 19.

Browse Source 
This only applies to builds that use the old `version` option.
This commit is contained in:
Fabio Niephaus 2023-06-20 15:37:11 +02:00
parent 4a419f5908
commit 8ae40e7db9
No known key found for this signature in database
GPG Key ID: F21CF5275F31DFD6
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/main/index.js generated vendored
View File

@ -70696,7 +70696,9 @@ function fetchArtifact(userAgent, metadata, version, javaVersion) {
} }
const artifactResponse = JSON.parse(yield response.readBody()); const artifactResponse = JSON.parse(yield response.readBody());
if (artifactResponse.items.length !== 1) { if (artifactResponse.items.length !== 1) {
throw new Error(`Found more than one GDS artifact`); throw new Error(artifactResponse.items.length > 1
? `Found more than one GDS artifact. ${c.ERROR_HINT}`
: `Unable to find GDS artifact. Are you sure version: '${version}' is correct?`);
} }
return artifactResponse.items[0]; return artifactResponse.items[0];
}); });
@ -70974,7 +70976,7 @@ exports.findHighestJavaVersion = findHighestJavaVersion;
// Support for GraalVM 22.X releases and earlier // Support for GraalVM 22.X releases and earlier
function setUpGraalVMLatest_22_X(gdsToken, javaVersion) { function setUpGraalVMLatest_22_X(gdsToken, javaVersion) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const lockedVersion = '22.3.2'; const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.2';
if (gdsToken.length > 0) { if (gdsToken.length > 0) {
return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion); return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion);
} }

6
src/gds.ts
View File

@ -70,7 +70,11 @@ export async function fetchArtifact(
await response.readBody() await response.readBody()
) as GDSArtifactsResponse ) as GDSArtifactsResponse
if (artifactResponse.items.length !== 1) { if (artifactResponse.items.length !== 1) {
throw new Error(`Found more than one GDS artifact`) throw new Error(
artifactResponse.items.length > 1
? `Found more than one GDS artifact. ${c.ERROR_HINT}`
: `Unable to find GDS artifact. Are you sure version: '${version}' is correct?`
)
} }
return artifactResponse.items[0] return artifactResponse.items[0]
} }

2
src/graalvm.ts
View File

@ -164,7 +164,7 @@ export async function setUpGraalVMLatest_22_X(
gdsToken: string, gdsToken: string,
javaVersion: string javaVersion: string
): Promise<string> { ): Promise<string> {
const lockedVersion = '22.3.2' const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.2'
if (gdsToken.length > 0) { if (gdsToken.length > 0) {
return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion) return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion)
} }