Improve version check for reports.

This commit is contained in:
Fabio Niephaus
2023-06-17 16:17:01 +02:00
parent 8f41000162
commit 04ca584c1b
4 changed files with 15 additions and 11 deletions

View File

@@ -79,6 +79,7 @@ interface BuildOutput {
}
export async function setUpNativeImageBuildReports(
isGraalVMforJDK17OrLater: boolean,
graalVMVersion: string
): Promise<void> {
const isRequired = areJobReportsEnabled() || arePRReportsEnabled()
@@ -88,7 +89,7 @@ export async function setUpNativeImageBuildReports(
const isSupported =
graalVMVersion === c.VERSION_LATEST ||
graalVMVersion === c.VERSION_DEV ||
graalVMVersion.length === 0 ||
isGraalVMforJDK17OrLater ||
(!graalVMVersion.startsWith(c.MANDREL_NAMESPACE) &&
gte(toSemVer(graalVMVersion), '22.2.0'))
if (!isSupported) {

View File

@@ -38,9 +38,11 @@ async function run(): Promise<void> {
await setUpNativeImageMusl()
}
// Download or build GraalVM
// Download GraalVM JDK
const isGraalVMforJDK17OrLater =
distribution.length > 0 || graalvmVersion.length == 0
let graalVMHome
if (distribution.length > 0 || graalvmVersion.length == 0) {
if (isGraalVMforJDK17OrLater) {
switch (distribution) {
case c.DISTRIBUTION_GRAALVM:
graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
@@ -132,7 +134,7 @@ async function run(): Promise<void> {
if (cache && isCacheAvailable()) {
await restore(cache)
}
setUpNativeImageBuildReports(graalvmVersion)
setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalvmVersion)
} catch (error) {
if (error instanceof Error) core.setFailed(error.message)
}