Bump version to 1.1.3.

GraalVM Updater no longer works on `22.3.0`.

.github/workflows/test.yml

@@ -106,7 +106,7 @@ jobs:
       - name: Check environment
         run: |
           echo "GRAALVM_HOME: $GRAALVM_HOME"
-          if [[ "${{ matrix.version }}" == "dev" ]]; then
+          if [[ "${{ matrix.version }}" == "dev" ]] && [[ "${{ matrix.java-version }}" == "dev" ]]; then
             [[ "$GRAALVM_HOME" == *"$RUNNER_TEMP"* ]] || exit 12
           else
             [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
@@ -115,7 +115,9 @@ jobs:
           java --version
           java --version | grep "GraalVM" || exit 34
           native-image --version
-          gu list
+          if [[ "${{ matrix.java-version }}" != "dev" ]]; then
+            gu list
+          fi
         if: runner.os != 'Windows'
       - name: Check Windows environment
         run: |
@@ -133,15 +135,15 @@ jobs:
     strategy:
       matrix:
         version: ['latest']
-        java-version: ['19']
+        java-version: ['17']
         components: ['native-image']
         os: [macos-latest, windows-latest, ubuntu-latest]
         include:
-          - version: '22.3.0'
+          - version: '22.3.3'
             java-version: '11'
             components: 'native-image'
             os: ubuntu-latest
-          - version: '22.3.0'
+          - version: '22.3.3'
             java-version: '17'
             components: 'native-image'
             os: ubuntu-latest
@@ -161,7 +163,7 @@ jobs:
           [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
           echo "JAVA_HOME: $JAVA_HOME"
           java --version
-          java --version | grep "GraalVM EE" || exit 23
+          java --version | grep -e "GraalVM EE" -e "Oracle GraalVM" || exit 23
           native-image --version
           gu list
         if: runner.os != 'Windows'
@@ -207,6 +209,7 @@ jobs:
           [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
           echo "JAVA_HOME: $JAVA_HOME"
           java --version
+          java --version | grep "Temurin" || exit 23
           native-image --version
         if: runner.os != 'Windows'
       - name: Check Windows environment

dist/main/index.js

@@ -70824,7 +70824,7 @@ const assert_1 = __nccwpck_require__(9491);
 const uuid_1 = __nccwpck_require__(5840);
 function downloadGraalVMEELegacy(gdsToken, version, javaVersion) {
     return __awaiter(this, void 0, void 0, function* () {
-        const userAgent = `GraalVMGitHubAction/1.1.2 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`;
+        const userAgent = `GraalVMGitHubAction/1.1.3 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`;
         const baseArtifact = yield fetchArtifact(userAgent, 'isBase:True', version, javaVersion);
         return downloadArtifact(gdsToken, userAgent, baseArtifact);
     });
@@ -71129,7 +71129,7 @@ exports.findHighestJavaVersion = findHighestJavaVersion;
 // Support for GraalVM 22.X releases and earlier
 function setUpGraalVMLatest_22_X(gdsToken, javaVersion) {
     return __awaiter(this, void 0, void 0, function* () {
-        const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.2';
+        const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.3';
         if (gdsToken.length > 0) {
             return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion);
         }
@@ -71204,6 +71204,29 @@ function downloadGraalVMCELegacy(version, javaVersion) {
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -71215,9 +71238,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.setUpGUComponents = void 0;
+const c = __importStar(__nccwpck_require__(9042));
+const core = __importStar(__nccwpck_require__(2186));
 const constants_1 = __nccwpck_require__(9042);
 const utils_1 = __nccwpck_require__(1314);
 const path_1 = __nccwpck_require__(1017);
+const semver_1 = __nccwpck_require__(1383);
 const BASE_FLAGS = ['--non-interactive', 'install', '--no-progress'];
 const COMPONENT_TO_POST_INSTALL_HOOK = new Map([
     [
@@ -71236,7 +71262,26 @@ const COMPONENT_TO_POST_INSTALL_HOOK = new Map([
     ]
     // No post install hooks for Windows (yet)
 ]);
-function setUpGUComponents(gdsToken, graalVMHome, components) {
+function setUpGUComponents(javaVersion, graalVMVersion, graalVMHome, components, gdsToken) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (components.length == 0) {
+            return; // nothing to do
+        }
+        if (graalVMVersion === c.VERSION_DEV ||
+            javaVersion === c.VERSION_DEV ||
+            ((0, semver_1.valid)(javaVersion) && (0, semver_1.gte)(javaVersion, '21'))) {
+            core.warning(`Unable to install component(s): '${components.join(',')}'. The latest GraalVM dev builds and the upcoming GraalVM for JDK 21 no longer include the GraalVM Updater: https://github.com/oracle/graal/issues/6855`);
+        }
+        else if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+            core.warning(`Mandrel does not support GraalVM component(s): '${components.join(',')}'`);
+        }
+        else {
+            yield installGUComponents(gdsToken, graalVMHome, components);
+        }
+    });
+}
+exports.setUpGUComponents = setUpGUComponents;
+function installGUComponents(gdsToken, graalVMHome, components) {
     return __awaiter(this, void 0, void 0, function* () {
         yield (0, utils_1.exec)('gu', BASE_FLAGS.concat(components), {
             env: Object.assign(Object.assign({}, process.env), { GRAAL_EE_DOWNLOAD_TOKEN: gdsToken })
@@ -71252,7 +71297,6 @@ function setUpGUComponents(gdsToken, graalVMHome, components) {
         }
     });
 }
-exports.setUpGUComponents = setUpGUComponents;
 
 
 /***/ }),
@@ -71298,7 +71342,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const c = __importStar(__nccwpck_require__(9042));
 const core = __importStar(__nccwpck_require__(2186));
 const graalvm = __importStar(__nccwpck_require__(5254));
-const semver_1 = __nccwpck_require__(1383);
+const semver = __importStar(__nccwpck_require__(1383));
 const cache_1 = __nccwpck_require__(7799);
 const path_1 = __nccwpck_require__(1017);
 const cache_2 = __nccwpck_require__(9179);
@@ -71314,7 +71358,7 @@ function run() {
         try {
             const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, { required: true });
             const distribution = core.getInput(c.INPUT_DISTRIBUTION);
-            const graalvmVersion = core.getInput(c.INPUT_VERSION);
+            const graalVMVersion = core.getInput(c.INPUT_VERSION);
             const gdsToken = core.getInput(c.INPUT_GDS_TOKEN);
             const componentsString = core.getInput(c.INPUT_COMPONENTS);
             const components = componentsString.length > 0
@@ -71325,14 +71369,14 @@ function run() {
             const enableCheckForUpdates = core.getInput(c.INPUT_CHECK_FOR_UPDATES) === 'true';
             const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true';
             if (c.IS_WINDOWS) {
-                (0, msvc_1.setUpWindowsEnvironment)(graalvmVersion);
+                (0, msvc_1.setUpWindowsEnvironment)(graalVMVersion);
             }
             yield (0, dependencies_1.setUpDependencies)(components);
             if (enableNativeImageMusl) {
                 yield (0, musl_1.setUpNativeImageMusl)();
             }
             // Download GraalVM JDK
-            const isGraalVMforJDK17OrLater = distribution.length > 0 || graalvmVersion.length == 0;
+            const isGraalVMforJDK17OrLater = distribution.length > 0 || graalVMVersion.length == 0;
             let graalVMHome;
             if (isGraalVMforJDK17OrLater) {
                 switch (distribution) {
@@ -71343,12 +71387,13 @@ function run() {
                         graalVMHome = yield graalvm.setUpGraalVMJDKCE(javaVersion);
                         break;
                     case c.DISTRIBUTION_MANDREL:
-                        if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+                        if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-                            graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalvmVersion, javaVersion);
+                            graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalVMVersion, javaVersion);
                         }
                         else {
                             throw new Error(`Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`);
                         }
+                        break;
                     case '':
                         if (javaVersion === c.VERSION_DEV) {
                             core.info(`This build is using GraalVM Community Edition. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`);
@@ -71364,10 +71409,10 @@ function run() {
                 }
             }
             else {
-                switch (graalvmVersion) {
+                switch (graalVMVersion) {
                     case c.VERSION_LATEST:
                         if (javaVersion.startsWith('17') ||
-                            ((0, semver_1.valid)(javaVersion) && (0, semver_1.gte)(javaVersion, '20'))) {
+                            (semver.valid(javaVersion) && semver.gte(javaVersion, '20.0.0'))) {
                             core.info(`This build is using the new Oracle GraalVM. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`);
                             graalVMHome = yield graalvm.setUpGraalVMJDK(javaVersion);
                         }
@@ -71379,17 +71424,25 @@ function run() {
                         if (gdsToken.length > 0) {
                             throw new Error('Downloading GraalVM EE dev builds is not supported');
                         }
-                        graalVMHome = yield graalvm.setUpGraalVMJDKDevBuild();
+                        const coercedJavaVersion = semver.coerce(javaVersion);
+                        if (coercedJavaVersion !== null &&
+                            !semver.gte(coercedJavaVersion, '21.0.0')) {
+                            core.warning(`GraalVM dev builds are only available for JDK 21. This build is now using a stable release of GraalVM for JDK ${javaVersion}.`);
+                            graalVMHome = yield graalvm.setUpGraalVMJDK(javaVersion);
+                        }
+                        else {
+                            graalVMHome = yield graalvm.setUpGraalVMJDKDevBuild();
+                        }
                         break;
                     default:
-                        if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+                        if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-                            graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalvmVersion, javaVersion);
+                            graalVMHome = yield (0, mandrel_1.setUpMandrel)(graalVMVersion, javaVersion);
                         }
                         else {
                             if (enableCheckForUpdates) {
-                                yield (0, check_for_updates_1.checkForUpdates)(graalvmVersion, javaVersion);
+                                yield (0, check_for_updates_1.checkForUpdates)(graalVMVersion, javaVersion);
                             }
-                            graalVMHome = yield graalvm.setUpGraalVMRelease(gdsToken, graalvmVersion, javaVersion);
+                            graalVMHome = yield graalvm.setUpGraalVMRelease(gdsToken, graalVMVersion, javaVersion);
                         }
                         break;
                 }
@@ -71401,19 +71454,11 @@ function run() {
             if (setJavaHome) {
                 core.exportVariable('JAVA_HOME', graalVMHome);
             }
-            // Set up GraalVM components (if any)
+            yield (0, gu_1.setUpGUComponents)(javaVersion, graalVMVersion, graalVMHome, components, gdsToken);
-            if (components.length > 0) {
-                if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
-                    core.warning(`Mandrel does not support GraalVM components: ${componentsString}`);
-                }
-                else {
-                    yield (0, gu_1.setUpGUComponents)(gdsToken, graalVMHome, components);
-                }
-            }
             if (cache && (0, cache_1.isFeatureAvailable)()) {
                 yield (0, cache_2.restore)(cache);
             }
-            (0, reports_1.setUpNativeImageBuildReports)(isGraalVMforJDK17OrLater, graalvmVersion);
+            (0, reports_1.setUpNativeImageBuildReports)(isGraalVMforJDK17OrLater, graalVMVersion);
         }
         catch (error) {
             if (error instanceof Error)

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "setup-graalvm",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "setup-graalvm",
-      "version": "1.1.2",
+      "version": "1.1.3",
       "license": "UPL",
       "dependencies": {
         "@actions/cache": "^3.0.4",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "setup-graalvm",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "private": true,
   "description": "GitHub Action for GraalVM",
   "main": "lib/main.js",

src/gds.ts

@@ -32,7 +32,7 @@ export async function downloadGraalVMEELegacy(
   version: string,
   javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/1.1.2 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const userAgent = `GraalVMGitHubAction/1.1.3 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
   const baseArtifact = await fetchArtifact(
     userAgent,
     'isBase:True',

src/graalvm.ts

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

src/gu.ts

@@ -1,6 +1,9 @@
+import * as c from './constants'
+import * as core from '@actions/core'
 import {GRAALVM_PLATFORM} from './constants'
 import {exec} from './utils'
 import {join} from 'path'
+import {gte as semverGte, valid as semverValid} from 'semver'
 
 const BASE_FLAGS = ['--non-interactive', 'install', '--no-progress']
 const COMPONENT_TO_POST_INSTALL_HOOK = new Map<string, Map<string, string>>([
@@ -22,6 +25,35 @@ const COMPONENT_TO_POST_INSTALL_HOOK = new Map<string, Map<string, string>>([
 ])
 
 export async function setUpGUComponents(
+  javaVersion: string,
+  graalVMVersion: string,
+  graalVMHome: string,
+  components: string[],
+  gdsToken: string
+): Promise<void> {
+  if (components.length == 0) {
+    return // nothing to do
+  }
+  if (
+    graalVMVersion === c.VERSION_DEV ||
+    javaVersion === c.VERSION_DEV ||
+    (semverValid(javaVersion) && semverGte(javaVersion, '21'))
+  ) {
+    core.warning(
+      `Unable to install component(s): '${components.join(
+        ','
+      )}'. The latest GraalVM dev builds and the upcoming GraalVM for JDK 21 no longer include the GraalVM Updater: https://github.com/oracle/graal/issues/6855`
+    )
+  } else if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
+    core.warning(
+      `Mandrel does not support GraalVM component(s): '${components.join(',')}'`
+    )
+  } else {
+    await installGUComponents(gdsToken, graalVMHome, components)
+  }
+}
+
+async function installGUComponents(
   gdsToken: string,
   graalVMHome: string,
   components: string[]

src/main.ts

@@ -1,7 +1,7 @@
 import * as c from './constants'
 import * as core from '@actions/core'
 import * as graalvm from './graalvm'
-import {gte as semverGte, valid as semverValid} from 'semver'
+import * as semver from 'semver'
 import {isFeatureAvailable as isCacheAvailable} from '@actions/cache'
 import {join} from 'path'
 import {restore} from './features/cache'
@@ -17,7 +17,7 @@ async function run(): Promise<void> {
   try {
     const javaVersion = core.getInput(c.INPUT_JAVA_VERSION, {required: true})
     const distribution = core.getInput(c.INPUT_DISTRIBUTION)
-    const graalvmVersion = core.getInput(c.INPUT_VERSION)
+    const graalVMVersion = core.getInput(c.INPUT_VERSION)
     const gdsToken = core.getInput(c.INPUT_GDS_TOKEN)
     const componentsString: string = core.getInput(c.INPUT_COMPONENTS)
     const components: string[] =
@@ -31,7 +31,7 @@ async function run(): Promise<void> {
     const enableNativeImageMusl = core.getInput(c.INPUT_NI_MUSL) === 'true'
 
     if (c.IS_WINDOWS) {
-      setUpWindowsEnvironment(graalvmVersion)
+      setUpWindowsEnvironment(graalVMVersion)
     }
     await setUpDependencies(components)
     if (enableNativeImageMusl) {
@@ -40,7 +40,7 @@ async function run(): Promise<void> {
 
     // Download GraalVM JDK
     const isGraalVMforJDK17OrLater =
-      distribution.length > 0 || graalvmVersion.length == 0
+      distribution.length > 0 || graalVMVersion.length == 0
     let graalVMHome
     if (isGraalVMforJDK17OrLater) {
       switch (distribution) {
@@ -51,13 +51,14 @@ async function run(): Promise<void> {
           graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
           break
         case c.DISTRIBUTION_MANDREL:
-          if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+          if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-            graalVMHome = await setUpMandrel(graalvmVersion, javaVersion)
+            graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
           } else {
             throw new Error(
               `Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
             )
           }
+          break
         case '':
           if (javaVersion === c.VERSION_DEV) {
             core.info(
@@ -75,11 +76,11 @@ async function run(): Promise<void> {
           throw new Error(`Unsupported distribution: ${distribution}`)
       }
     } else {
-      switch (graalvmVersion) {
+      switch (graalVMVersion) {
         case c.VERSION_LATEST:
           if (
             javaVersion.startsWith('17') ||
-            (semverValid(javaVersion) && semverGte(javaVersion, '20'))
+            (semver.valid(javaVersion) && semver.gte(javaVersion, '20.0.0'))
           ) {
             core.info(
               `This build is using the new Oracle GraalVM. To select a specific distribution, use the 'distribution' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
@@ -98,18 +99,29 @@ async function run(): Promise<void> {
               'Downloading GraalVM EE dev builds is not supported'
             )
           }
-          graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          const coercedJavaVersion = semver.coerce(javaVersion)
+          if (
+            coercedJavaVersion !== null &&
+            !semver.gte(coercedJavaVersion, '21.0.0')
+          ) {
+            core.warning(
+              `GraalVM dev builds are only available for JDK 21. This build is now using a stable release of GraalVM for JDK ${javaVersion}.`
+            )
+            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
+          } else {
+            graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
+          }
           break
         default:
-          if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+          if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-            graalVMHome = await setUpMandrel(graalvmVersion, javaVersion)
+            graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
           } else {
             if (enableCheckForUpdates) {
-              await checkForUpdates(graalvmVersion, javaVersion)
+              await checkForUpdates(graalVMVersion, javaVersion)
             }
             graalVMHome = await graalvm.setUpGraalVMRelease(
               gdsToken,
-              graalvmVersion,
+              graalVMVersion,
               javaVersion
             )
           }
@@ -125,21 +137,18 @@ async function run(): Promise<void> {
       core.exportVariable('JAVA_HOME', graalVMHome)
     }
 
-    // Set up GraalVM components (if any)
+    await setUpGUComponents(
-    if (components.length > 0) {
+      javaVersion,
-      if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+      graalVMVersion,
-        core.warning(
+      graalVMHome,
-          `Mandrel does not support GraalVM components: ${componentsString}`
+      components,
-        )
+      gdsToken
-      } else {
+    )
-        await setUpGUComponents(gdsToken, graalVMHome, components)
-      }
-    }
 
     if (cache && isCacheAvailable()) {
       await restore(cache)
     }
-    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalvmVersion)
+    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion)
   } catch (error) {
     if (error instanceof Error) core.setFailed(error.message)
   }