Skip to content

Commit 348396c

Browse files
committed
Use edition instead of displayName.
Also, sort by `version`, not `java`.
1 parent 8c5543b commit 348396c

2 files changed

Lines changed: 21 additions & 20 deletions

File tree

dist/main.js

Lines changed: 11 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/gds.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export async function fetchArtifact(
6161
}
6262

6363
const catalogOS = c.IS_MACOS ? 'macos' : c.GRAALVM_PLATFORM
64-
const requestUrl = `${c.GDS_BASE}/artifacts?productId=${c.GDS_GRAALVM_PRODUCT_ID}&displayName=Oracle%20GraalVM&metadata=java:jdk${majorJavaVersion}&metadata=os:${catalogOS}&metadata=arch:${c.GRAALVM_ARCH}&metadata=isBase:True&status=PUBLISHED&responseFields=id&responseFields=checksum&sortBy=m:version&sortOrder=DESC`
64+
const requestUrl = `${c.GDS_BASE}/artifacts?productId=${c.GDS_GRAALVM_PRODUCT_ID}&metadata=edition:ee&metadata=java:jdk${majorJavaVersion}&metadata=os:${catalogOS}&metadata=arch:${c.GRAALVM_ARCH}&metadata=isBase:True&status=PUBLISHED&responseFields=id&responseFields=checksum&sortBy=m:version&sortOrder=DESC`
6565
core.debug(`Requesting ${requestUrl}`)
6666
const response = await http.get(requestUrl, { accept: 'application/json' })
6767
if (response.message.statusCode !== 200) {
@@ -117,7 +117,7 @@ export async function fetchArtifactByJavaVersion(
117117
if (javaVersion.includes('.')) {
118118
filter = `metadata=version:${javaVersion}`
119119
} else {
120-
filter = `sortBy=m:java&sortOrder=DESC&limit=1` // latest and only one item
120+
filter = `sortBy=m:version&sortOrder=DESC&limit=1` // latest and only one item
121121
}
122122

123123
let majorJavaVersion
@@ -128,21 +128,19 @@ export async function fetchArtifactByJavaVersion(
128128
}
129129

130130
const catalogOS = c.IS_MACOS ? 'macos' : c.GRAALVM_PLATFORM
131-
const requestUrl = `${c.GDS_BASE}/artifacts?productId=${c.GDS_GRAALVM_PRODUCT_ID}&displayName=Oracle%20GraalVM&${filter}&metadata=java:jdk${majorJavaVersion}&metadata=os:${catalogOS}&metadata=arch:${c.GRAALVM_ARCH}&metadata=${metadata}&status=PUBLISHED&responseFields=id&responseFields=checksum`
131+
const requestUrl = `${c.GDS_BASE}/artifacts?productId=${c.GDS_GRAALVM_PRODUCT_ID}&metadata=edition:ee&${filter}&metadata=java:jdk${majorJavaVersion}&metadata=os:${catalogOS}&metadata=arch:${c.GRAALVM_ARCH}&metadata=${metadata}&status=PUBLISHED&responseFields=id&responseFields=checksum`
132132
core.debug(`Requesting ${requestUrl}`)
133133
const response = await http.get(requestUrl, { accept: 'application/json' })
134134
if (response.message.statusCode !== 200) {
135-
throw new Error(
136-
`Unable to find GraalVM for JDK ${javaVersion}. Are you sure java-version: '${javaVersion}' is correct?`
137-
)
135+
throw new Error(`Unable to find GDS artifact. Are you sure java-version: '${javaVersion}' is correct?`)
138136
}
139137
const artifactResponse = JSON.parse(await response.readBody()) as GDSArtifactsResponse
140138
if (artifactResponse.items.length !== 1) {
141-
throw new Error(
142-
artifactResponse.items.length > 1
143-
? `Found more than one GDS artifact. ${c.ERROR_HINT}`
144-
: `Unable to find GDS artifact. Are you sure java-version: '${javaVersion}' is correct?`
145-
)
139+
if (artifactResponse.items.length > 1) {
140+
core.warning(`Found more than one GDS artifact. ${c.ERROR_HINT}`)
141+
} else {
142+
throw new Error(`Unable to find GDS artifact. Are you sure java-version: '${javaVersion}' is correct?`)
143+
}
146144
}
147145
return artifactResponse.items[0]
148146
}
@@ -157,7 +155,7 @@ export async function fetchArtifactEE(
157155

158156
let filter
159157
if (version === c.VERSION_LATEST) {
160-
filter = `sortBy=displayName&sortOrder=DESC&limit=1` // latest and only one item
158+
filter = `sortBy=m:version&sortOrder=DESC&limit=1` // latest and only one item
161159
} else {
162160
filter = `metadata=version:${version}`
163161
}

0 commit comments

Comments
 (0)