Bump version to 1.1.0.

Incorporate additional feedback.
Incorporate more reviewer feedback.
2023-06-16 13:04:28 +02:00 · 2023-06-16 13:03:32 +02:00 · 2023-06-16 12:15:03 +02:00 · 2023-06-16 10:34:13 +02:00 · 2023-06-16 09:19:49 +02:00 · 2023-06-15 17:59:26 +02:00
16 changed files with 17796 additions and 61977 deletions
--- a/.github/workflows/check-dist.yml
+++ b/.github/workflows/check-dist.yml
@@ -24,7 +24,7 @@ jobs:
    runs-on: ubuntu-latest

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      - name: Set Node.js 16.x
        uses: actions/setup-node@v3
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,7 +15,7 @@ jobs:
  build: # make sure build/ci work properly
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - run: |
          npm install
      - run: |
@@ -25,33 +25,17 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        java-version: ['21', '17', '20', 'dev']
+        java-version: ['17', '20', 'dev']
        distribution: ['graalvm', 'graalvm-community']
        os: [macos-latest, windows-latest, ubuntu-latest]
-        components: ['']
-        include:
-          - java-version: '21'
-            distribution: ''
-            os: ubuntu-latest
-          - java-version: 'dev'
-            distribution: ''
-            os: windows-latest
-          - java-version: '21'
-            distribution: 'graalvm-community'
-            os: ubuntu-latest
-            components: 'native-image' # should print a warning but not fail
-          - java-version: '21.0.0' # test for GA version (see #63)
-            distribution: 'graalvm'
-            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
          java-version: ${{ matrix.java-version }}
          distribution: ${{ matrix.distribution }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
-          components: ${{ matrix.components }}
      - name: Check environment
        run: |
          echo "GRAALVM_HOME: $GRAALVM_HOME"
@@ -104,7 +88,7 @@ jobs:
            components: 'native-image'
            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -115,7 +99,7 @@ jobs:
      - name: Check environment
        run: |
          echo "GRAALVM_HOME: $GRAALVM_HOME"
-          if [[ "${{ matrix.version }}" == "dev" ]] && [[ "${{ matrix.java-version }}" == "dev" ]]; then
+          if [[ "${{ matrix.version }}" == "dev" ]]; then
            [[ "$GRAALVM_HOME" == *"$RUNNER_TEMP"* ]] || exit 12
          else
            [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 23
@@ -124,9 +108,7 @@ jobs:
          java --version
          java --version | grep "GraalVM" || exit 34
          native-image --version
-          if [[ "${{ matrix.java-version }}" != "dev" ]]; then
-            gu list
-          fi
+          gu list
        if: runner.os != 'Windows'
      - name: Check Windows environment
        run: |
@@ -144,20 +126,20 @@ jobs:
    strategy:
      matrix:
        version: ['latest']
-        java-version: ['17']
+        java-version: ['19']
        components: ['native-image']
        os: [macos-latest, windows-latest, ubuntu-latest]
        include:
-          - version: '22.3.3'
+          - version: '22.3.0'
            java-version: '11'
            components: 'native-image'
            os: ubuntu-latest
-          - version: '22.3.3'
+          - version: '22.3.0'
            java-version: '17'
            components: 'native-image'
            os: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -172,7 +154,7 @@ jobs:
          [[ "$GRAALVM_HOME" == *"$RUNNER_TOOL_CACHE"* ]] || exit 12
          echo "JAVA_HOME: $JAVA_HOME"
          java --version
-          java --version | grep -e "GraalVM EE" -e "Oracle GraalVM" || exit 23
+          java --version | grep "GraalVM EE" || exit 23
          native-image --version
          gu list
        if: runner.os != 'Windows'
@@ -190,26 +172,19 @@ jobs:
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
-        version: ['mandrel-22.2.0.0-Final', '23.0.1.2-Final', 'mandrel-latest']
+        version: ['mandrel-22.2.0.0-Final', 'mandrel-latest']
        java-version: ['17']
-        distribution: ['mandrel']
        os: [windows-latest, ubuntu-latest]
-        include:
+        exclude: # temporarily disable Mandrel latest builds on Windows due to unavailability
          - version: 'mandrel-latest'
            java-version: '17'
-            distribution: '' # test empty distribution for backward compatibility
-            os: ubuntu-latest
-          - version: '' # test with no version
-            java-version: '21'
-            distribution: 'mandrel'
-            os: ubuntu-latest
+            os: windows-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
          version: ${{ matrix.version }}
-          distribution: ${{ matrix.distribution }}
          java-version: ${{ matrix.java-version }}
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Check environment
@@ -218,7 +193,6 @@ 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
@@ -235,7 +209,7 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -257,7 +231,7 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -279,7 +253,7 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
@@ -302,11 +276,11 @@ jobs:
      contents: read
      pull-requests: write # for `native-image-pr-reports` option
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - name: Run setup-graalvm action
        uses: ./
        with:
-          java-version: '17.0.8'
+          java-version: '17'
          distribution: 'graalvm'
          components: 'espresso,llvm-toolchain,native-image,nodejs,python,ruby,wasm'
          set-java-home: 'false'
@@ -337,16 +311,16 @@ jobs:
          javac HelloWorld.java
          native-image -g HelloWorld
          ./helloworld
-      # - name: Build Ruby-FFI with TruffleRuby
-      #   run: |
-      #     [[ $(which bundle) == *"graalvm"* ]] || exit 57
-      #     git clone --depth 1 https://github.com/ffi/ffi.git
-      #     pushd ffi > /dev/null
-      #     # https://github.com/ffi/ffi/blob/447845cb3030194c79700c86fb388a12e6f81386/.github/workflows/ci.yml#L58-L62
-      #     bundle install
-      #     bundle exec rake libffi
-      #     bundle exec rake compile
-      #     bundle exec rake test
-      #     popd > /dev/null
+      - name: Build Ruby-FFI with TruffleRuby
+        run: |
+          [[ $(which bundle) == *"graalvm"* ]] || exit 57
+          git clone --depth 1 https://github.com/ffi/ffi.git
+          pushd ffi > /dev/null
+          # https://github.com/ffi/ffi/blob/447845cb3030194c79700c86fb388a12e6f81386/.github/workflows/ci.yml#L58-L62
+          bundle install
+          bundle exec rake libffi
+          bundle exec rake compile
+          bundle exec rake test
+          popd > /dev/null
      - name: Remove components
        run: gu remove espresso llvm-toolchain nodejs python ruby wasm
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ This action:

 ## Migrating from GraalVM 22.3 or Earlier to the New GraalVM for JDK 17 and Later

-The [GraalVM for JDK 17 and JDK 20 release](https://medium.com/graalvm/a-new-graalvm-release-and-new-free-license-4aab483692f5) aligns the GraalVM version scheme with OpenJDK.
+The new [GraalVM for JDK 17 and JDK 20 release](https://medium.com/graalvm/a-new-graalvm-release-and-new-free-license-4aab483692f5) aligns the GraalVM version scheme with OpenJDK.
 As a result, this action no longer requires the `version` option to select a specific GraalVM version.
 At the same time, it introduces a new `distribution` option to select a specific GraalVM distribution (`graalvm`, `graalvm-community`, or `mandrel`).
 Therefore, to migrate your workflow to use the latest GraalVM release, replace the `version` with the `distribution` option in the workflow `yml` config, for example:
@@ -54,10 +54,10 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: graalvm/setup-graalvm@v1
        with:
-          java-version: '21'
+          java-version: '17.0.7'
          distribution: 'graalvm' # See 'Options' for all available distributions
          github-token: ${{ secrets.GITHUB_TOKEN }}
      - name: Example step
@@ -85,11 +85,11 @@ jobs:
      matrix:
        os: [macos-latest, windows-latest, ubuntu-latest]
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3

      - uses: graalvm/setup-graalvm@v1
        with:
-          java-version: '21'
+          java-version: '17.0.7'
          distribution: 'graalvm'
          github-token: ${{ secrets.GITHUB_TOKEN }}
          native-image-job-reports: 'true'
@@ -118,7 +118,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: graalvm/setup-graalvm@v1
        with:
          version: '22.3.2' # GraalVM version
@@ -146,7 +146,7 @@ jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
      - uses: graalvm/setup-graalvm@v1
        with:
          version: '22.3.0'
@@ -166,7 +166,7 @@ jobs:

 | Name            | Default  | Description |
 |-----------------|:--------:|-------------|
-| `java-version`<br>*(required)* | n/a | `'21'` or `'17.0.7'` for a specific Java version, `'dev'` for a dev build with the latest Java version available.<br>(`'8'`, `'11'`, `'16'`, `'19'` are supported for older GraalVM releases.) |
+| `java-version`<br>*(required)* | n/a | `'17.0.7'` or `'20.0.1'` for a specific Java version, `'dev'` for a dev build with the latest Java version available.<br>(`'8'`, `'11'`, `'16'`, `'19'` are supported for older GraalVM releases.) |
 | `distribution`  | `''` | GraalVM distribution (`graalvm` for Oracle GraalVM, `graalvm-community` for GraalVM Community Edition, `mandrel` for Mandrel). |
 | `github-token`  | `'${{ github.token }}'` | Token for communication with the GitHub API. Please set this to `${{ secrets.GITHUB_TOKEN }}` (see [templates](#templates)) to allow the action to authenticate with the GitHub API, which helps reduce rate-limiting issues. |
 | `set-java-home` | `'true'` | If set to `'true'`, instructs the action to set `$JAVA_HOME` to the path of the GraalVM installation. Overrides any previous action or command that sets `$JAVA_HOME`. |
@@ -176,7 +176,7 @@ jobs:
 | `native-image-job-reports` *) | `'false'` | If set to `'true'`, post a job summary containing a Native Image build report. |
 | `native-image-pr-reports`  *) | `'false'` | If set to `'true'`, post a comment containing a Native Image build report on pull requests. Requires `write` permissions for the [`pull-requests` scope][gha-permissions]. |
 | `components`    | `''`     | Comma-separated list of GraalVM components (e.g., `native-image` or `ruby,nodejs`) that will be installed by the [GraalVM Updater][gu]. |
-| `version` | `''` | `X.Y.Z` (e.g., `22.3.0`) for a specific [GraalVM release][releases] up to `22.3.2`<br>`mandrel-X.Y.Z.W` or `X.Y.Z.W-Final` (e.g., `mandrel-21.3.0.0-Final` or `21.3.0.0-Final`) for a specific [Mandrel release][mandrel-releases],<br>`mandrel-latest` or `latest` for the latest Mandrel stable release. |
+| `version` | `''` | `X.Y.Z` (e.g., `22.3.0`) for a specific [GraalVM release][releases] up to `22.3.2`<br>`mandrel-X.Y.Z` (e.g., `mandrel-21.3.0.0-Final`) for a specific [Mandrel release][mandrel-releases],<br>`mandrel-latest` for [latest Mandrel stable release][mandrel-stable]. |
 | `gds-token`     | `''`     | Download token for the GraalVM Download Service. If a non-empty token is provided, the action will set up GraalVM Enterprise Edition (see [GraalVM EE template](#template-for-graalvm-enterprise-edition)). |

 **) Make sure that Native Image is used only once per build job. Otherwise, the report is only generated for the last Native Image build.*
--- a/tests/mandrel.test.ts
+++ b/tests/mandrel.test.ts
@@ -1,75 +0,0 @@
-import * as path from 'path'
-import * as mandrel from '../src/mandrel'
-import {expect, test} from '@jest/globals'
-import {getLatestRelease} from '../src/utils'
-
-process.env['RUNNER_TOOL_CACHE'] = path.join(__dirname, 'TOOL_CACHE')
-process.env['RUNNER_TEMP'] = path.join(__dirname, 'TEMP')
-
-test('request invalid version/javaVersion combination', async () => {
-  for (var combination of [
-    ['mandrel-23.1.1.0-Final', '17'],
-    ['mandrel-23.0.2.1-Final', '21']
-  ]) {
-    let error = new Error('unexpected')
-    try {
-      await mandrel.setUpMandrel(combination[0], combination[1])
-    } catch (err) {
-      if (!(err instanceof Error)) {
-        fail(`Unexpected non-Error: ${err}`)
-      }
-      error = err
-    }
-
-    expect(error).not.toBeUndefined()
-    expect(error.message).toContain('Failed to download')
-    expect(error.message).toContain('Are you sure version')
-  }
-})
-test('request invalid version', async () => {
-  for (var combination of [
-    ['mandrel-23.1.1.0', '21'],
-    ['mandrel-23.0.2.1', '17']
-  ]) {
-    let error = new Error('unexpected')
-    try {
-      await mandrel.setUpMandrel(combination[0], combination[1])
-    } catch (err) {
-      if (!(err instanceof Error)) {
-        fail(`Unexpected non-Error: ${err}`)
-      }
-      error = err
-    }
-
-    expect(error).not.toBeUndefined()
-    expect(error.message).toContain('Failed to download')
-    expect(error.message).toContain('Are you sure version')
-  }
-})
-
-test('find latest', async () => {
-  // Make sure the action can find the latest Mandrel release
-  const latestRelease = await getLatestRelease(mandrel.MANDREL_REPO)
-  const tag_name = latestRelease.tag_name
-  expect(tag_name).toContain(mandrel.MANDREL_TAG_PREFIX)
-})
-
-test('get known latest Mandrel for specific JDK', async () => {
-  // Test deprecated versions that won't get updates anymore
-  for (var combination of [
-    ['11', '22.2.0.0-Final'],
-    ['20', '23.0.1.2-Final']
-  ]) {
-    const latest = await mandrel.getLatestMandrelReleaseUrl(combination[0])
-    expect(latest).toContain(`mandrel-java${combination[0]}`)
-    expect(latest).toContain(combination[1])
-  }
-})
-
-test('get latest Mandrel for specific JDK', async () => {
-  // Test supported versions
-  for (var javaVersion of ['17', '21']) {
-    const latest = await mandrel.getLatestMandrelReleaseUrl(javaVersion)
-    expect(latest).toContain(`mandrel-java${javaVersion}`)
-  }
-})
--- a/action.yml
+++ b/action.yml
@@ -54,7 +54,7 @@ outputs:
  cache-hit:
    description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
-  using: 'node20'
+  using: 'node16'
  main: 'dist/main/index.js'
  post: 'dist/cleanup/index.js'
  post-if: 'success()'
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
--- a/dist/main/index.js
+++ b/dist/main/index.js
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "setup-graalvm",
-  "version": "1.1.6",
+  "version": "1.1.0",
  "private": true,
  "description": "GitHub Action for GraalVM",
  "main": "lib/main.js",
@@ -27,37 +27,33 @@
  "author": "GraalVM Community",
  "license": "UPL",
  "dependencies": {
-    "@actions/cache": "^3.2.3",
-    "@actions/core": "^1.10.1",
-    "@actions/exec": "^1.1.1",
-    "@actions/github": "^6.0.0",
-    "@actions/glob": "^0.4.0",
-    "@actions/http-client": "^2.2.0",
-    "@actions/io": "^1.1.3",
-    "@actions/tool-cache": "^2.0.1",
-    "@octokit/core": "^5.1.0",
-    "@octokit/types": "^12.0.0",
-    "semver": "^7.5.4",
-    "uuid": "^9.0.1"
+    "@actions/cache": "^3.0.4",
+    "@actions/core": "^1.10.0",
+    "@actions/exec": "^1.1.0",
+    "@actions/github": "^5.1.1",
+    "@actions/glob": "^0.3.0",
+    "@actions/http-client": "^1.0.11",
+    "@actions/io": "^1.1.1",
+    "@actions/tool-cache": "^1.7.1",
+    "@octokit/core": "^3.5.1",
+    "@octokit/types": "^6.34.0",
+    "semver": "^7.3.8",
+    "uuid": "^8.3.2"
  },
  "devDependencies": {
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.10",
-    "@types/semver": "^7.5.6",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^6.19.1",
-    "@typescript-eslint/parser": "^6.19.1",
-    "@vercel/ncc": "^0.38.1",
-    "eslint": "^8.56.0",
-    "eslint-plugin-github": "^4.10.1",
-    "eslint-plugin-jest": "^27.6.3",
-    "eslint-plugin-jsonc": "^2.13.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^18.15.11",
+    "@types/semver": "^7.3.13",
+    "@types/uuid": "^8.3.4",
+    "@typescript-eslint/parser": "^5.8.1",
+    "@vercel/ncc": "^0.33.4",
+    "eslint": "^8.6.0",
+    "eslint-plugin-github": "^4.3.5",
+    "eslint-plugin-jest": "^25.3.4",
+    "jest": "^29.5.0",
    "js-yaml": "^4.1.0",
-    "prettier": "^3.2.4",
-    "prettier-eslint": "^16.3.0",
-    "ts-jest": "^29.1.2",
-    "typescript": "^5.3.3"
+    "prettier": "2.5.1",
+    "ts-jest": "^29.1.0",
+    "typescript": "^5.0.4"
  }
 }
--- a/src/features/check-for-updates.ts
+++ b/src/features/check-for-updates.ts
@@ -1,20 +1,18 @@
 import * as core from '@actions/core'
+import {getTaggedRelease, toSemVer} from '../utils'
+import {lt, major, minor, valid} from 'semver'
+import {findGraalVMVersion} from '../graalvm'
+import {GRAALVM_RELEASES_REPO} from '../constants'

-export function checkForUpdates(
+export async function checkForUpdates(
  graalVMVersion: string,
  javaVersion: string
-): void {
-  if (javaVersion === '20') {
-    core.notice(
-      'A new GraalVM release is available! Please consider upgrading to GraalVM for JDK 21: https://medium.com/graalvm/graalvm-for-jdk-21-is-here-ee01177dd12d'
-    )
-    return
-  }
+): Promise<void> {
  if (
    graalVMVersion.length > 0 &&
    (javaVersion === '17' || javaVersion === '19')
  ) {
-    const recommendedJDK = javaVersion === '17' ? '17' : '21'
+    const recommendedJDK = javaVersion === '17' ? '17' : '20'
    core.notice(
      `A new GraalVM release is available! Please consider upgrading to GraalVM for JDK ${recommendedJDK}. Instructions: https://github.com/graalvm/setup-graalvm#migrating-from-graalvm-223-or-earlier-to-the-new-graalvm-for-jdk-17-and-later`
    )
@@ -27,5 +25,23 @@ export function checkForUpdates(
    )
    return
  }
-  // TODO: add support for JDK-specific update checks (e.g., 17.0.X)
+
+  const latestRelease = await getTaggedRelease(
+    GRAALVM_RELEASES_REPO,
+    'vm-22.3.1'
+  )
+  const latestGraalVMVersion = findGraalVMVersion(latestRelease)
+  const selectedVersion = toSemVer(graalVMVersion)
+  const latestVersion = toSemVer(latestGraalVMVersion)
+  if (
+    valid(selectedVersion) &&
+    valid(latestVersion) &&
+    lt(selectedVersion, latestVersion)
+  ) {
+    core.notice(
+      `A new GraalVM release is available! Please consider upgrading to GraalVM ${latestGraalVMVersion}. Release notes: https://www.graalvm.org/release-notes/${major(
+        latestVersion
+      )}_${minor(latestVersion)}/`
+    )
+  }
 }
--- a/src/features/reports.ts
+++ b/src/features/reports.ts
@@ -33,18 +33,11 @@ interface BuildOutput {
    name: string
    graalvm_version: string
    java_version: string | null
-    vendor_version?: string
    c_compiler: string | null
    garbage_collector: string
-    graal_compiler?: {
-      optimization_level: string
-      march: string
-      pgo?: string[]
-    }
  }
  analysis_results: {
    classes: AnalysisResult
-    types?: AnalysisResult
    fields: AnalysisResult
    methods: AnalysisResult
  }
@@ -56,9 +49,6 @@ interface BuildOutput {
    }
    image_heap: {
      bytes: number
-      objects?: {
-        count: number
-      }
      resources: {
        count: number
        bytes: number
@@ -85,12 +75,10 @@ interface BuildOutput {
      system_total: number
      peak_rss_bytes: number
    }
-    total_secs?: number
  }
 }

 export async function setUpNativeImageBuildReports(
-  isGraalVMforJDK17OrLater: boolean,
  graalVMVersion: string
 ): Promise<void> {
  const isRequired = areJobReportsEnabled() || arePRReportsEnabled()
@@ -98,9 +86,9 @@ export async function setUpNativeImageBuildReports(
    return
  }
  const isSupported =
-    isGraalVMforJDK17OrLater ||
    graalVMVersion === c.VERSION_LATEST ||
    graalVMVersion === c.VERSION_DEV ||
+    graalVMVersion.length === 0 ||
    (!graalVMVersion.startsWith(c.MANDREL_NAMESPACE) &&
      gte(toSemVer(graalVMVersion), '22.2.0'))
  if (!isSupported) {
@@ -166,12 +154,7 @@ function createReport(data: BuildOutput): string {
  const context = github.context
  const info = data.general_info
  const analysis = data.analysis_results
-  const analysisTypes = analysis.types ? analysis.types : analysis.classes
  const details = data.image_details
-  let objectCount = ''
-  if (details.image_heap.objects) {
-    objectCount = `${details.image_heap.objects.count.toLocaleString()} objects, `
-  }
  const debugInfoBytes = details.debug_info ? details.debug_info.bytes : 0
  const otherBytes =
    details.total_bytes -
@@ -188,59 +171,12 @@ function createReport(data: BuildOutput): string {
      <td align="left"></td>
    </tr>`
  }
-  let versionLine
-  if (info.vendor_version) {
-    versionLine = `
-    <tr>
-      <td><a href="${DOCS_BASE}#glossary-java-info" target="_blank">Java version</a></td>
-      <td>${info.java_version}</td>
-      <td><a href="${DOCS_BASE}#glossary-java-info" target="_blank">Vendor version</a></td>
-      <td>${info.vendor_version}</td>
-    </tr>`
-  } else {
-    versionLine = `
-    <tr>
-      <td><a href="${DOCS_BASE}#glossary-version-info" target="_blank">GraalVM version</a></td>
-      <td>${info.graalvm_version}</td>
-      <td><a href="${DOCS_BASE}#glossary-java-version-info" target="_blank">Java version</a></td>
-      <td>${info.java_version}</td>
-    </tr>`
-  }
-  let graalLine
-  if (info.graal_compiler) {
-    let pgoSuffix = ''
-    const isOracleGraalVM =
-      info.vendor_version && info.vendor_version.includes('Oracle GraalVM')
-    if (isOracleGraalVM) {
-      const pgo = info.graal_compiler.pgo
-      const pgoText = pgo ? pgo.join('+') : 'off'
-      pgoSuffix = `, <a href="${DOCS_BASE}#recommendation-pgo" target="_blank">PGO</a>: ${pgoText}`
-    }
-    graalLine = `
-    <tr>
-      <td align="left"><a href="${DOCS_BASE}#glossary-graal-compiler" target="_blank">Graal compiler</a></td>
-      <td colspan="3">
-        optimization level: ${info.graal_compiler.optimization_level},
-        target machine: ${info.graal_compiler.march}${pgoSuffix}
-      </td>
-    </tr>`
-  }

  const resources = data.resource_usage

-  let totalTime = ''
-  let gcTotalTimeRatio = ''
-  if (resources.total_secs) {
-    totalTime = ` in ${secondsToHuman(resources.total_secs)}`
-    gcTotalTimeRatio = ` (${toPercent(
-      resources.garbage_collection.total_secs,
-      resources.total_secs
-    )} of total time)`
-  }
-
  return `## GraalVM Native Image Build Report

-\`${info.name}\` generated${totalTime} as part of the '${
+\`${info.name}\` generated as part of the '${
    context.job
  }' job in run <a href="${context.serverUrl}/${context.repo.owner}/${
    context.repo.repo
@@ -248,14 +184,18 @@ function createReport(data: BuildOutput): string {

 #### Environment

-<table>${versionLine}${graalLine}
+<table>
  <tr>
+    <td><a href="${DOCS_BASE}#glossary-version-info" target="_blank">GraalVM version</a></td>
+    <td>${info.graalvm_version}</td>
    <td><a href="${DOCS_BASE}#glossary-ccompiler" target="_blank">C compiler</a></td>
-    <td colspan="3">${info.c_compiler}</td>
+    <td>${info.c_compiler}</td>
  </tr>
  <tr>
+    <td><a href="${DOCS_BASE}#glossary-java-version-info" target="_blank">Java version</a></td>
+    <td>${info.java_version}</td>
    <td><a href="${DOCS_BASE}#glossary-gc" target="_blank">Garbage collector</a></td>
-    <td colspan="3">${info.garbage_collector}</td>
+    <td>${info.garbage_collector}</td>
  </tr>
 </table>

@@ -276,17 +216,17 @@ function createReport(data: BuildOutput): string {
  <tbody>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reachability" target="_blank">Reachable</a></td>
-      <td align="right">${analysisTypes.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.classes.reachable}</td>
      <td align="right">${toPercent(
-        analysisTypes.reachable,
-        analysisTypes.total
+        analysis.classes.reachable,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.fields.reachable}</td>
      <td align="right">${toPercent(
        analysis.fields.reachable,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reachable.toLocaleString()}</td>
+      <td align="right">${analysis.methods.reachable}</td>
      <td align="right">${toPercent(
        analysis.methods.reachable,
        analysis.methods.total
@@ -294,17 +234,17 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reflection-registrations" target="_blank">Reflection</a></td>
-      <td align="right">${analysisTypes.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.classes.reflection}</td>
      <td align="right">${toPercent(
-        analysisTypes.reflection,
-        analysisTypes.total
+        analysis.classes.reflection,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.fields.reflection}</td>
      <td align="right">${toPercent(
        analysis.fields.reflection,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.reflection.toLocaleString()}</td>
+      <td align="right">${analysis.methods.reflection}</td>
      <td align="right">${toPercent(
        analysis.methods.reflection,
        analysis.methods.total
@@ -312,17 +252,17 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-jni-access-registrations" target="_blank">JNI</a></td>
-      <td align="right">${analysisTypes.jni.toLocaleString()}</td>
+      <td align="right">${analysis.classes.jni}</td>
      <td align="right">${toPercent(
-        analysisTypes.jni,
-        analysisTypes.total
+        analysis.classes.jni,
+        analysis.classes.total
      )}</td>
-      <td align="right">${analysis.fields.jni.toLocaleString()}</td>
+      <td align="right">${analysis.fields.jni}</td>
      <td align="right">${toPercent(
        analysis.fields.jni,
        analysis.fields.total
      )}</td>
-      <td align="right">${analysis.methods.jni.toLocaleString()}</td>
+      <td align="right">${analysis.methods.jni}</td>
      <td align="right">${toPercent(
        analysis.methods.jni,
        analysis.methods.total
@@ -330,11 +270,11 @@ function createReport(data: BuildOutput): string {
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-reachability" target="_blank">Loaded</a></td>
-      <td align="right">${analysisTypes.total.toLocaleString()}</td>
+      <td align="right">${analysis.classes.total}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.fields.total.toLocaleString()}</td>
+      <td align="right">${analysis.fields.total}</td>
      <td align="right">100.000%</td>
-      <td align="right">${analysis.methods.total.toLocaleString()}</td>
+      <td align="right">${analysis.methods.total}</td>
      <td align="right">100.000%</td>
    </tr>
  </tbody>
@@ -359,7 +299,9 @@ function createReport(data: BuildOutput): string {
        details.code_area.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${details.code_area.compilation_units.toLocaleString()} compilation units</td>
+      <td align="left">${
+        details.code_area.compilation_units
+      } compilation units</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-image-heap" target="_blank">Image heap</a></td>
@@ -368,9 +310,9 @@ function createReport(data: BuildOutput): string {
        details.image_heap.bytes,
        details.total_bytes
      )}</td>
-      <td align="left">${objectCount}${bytesToHuman(
+      <td align="left">${bytesToHuman(
        details.image_heap.resources.bytes
-      )} for ${details.image_heap.resources.count.toLocaleString()} resources</td>
+      )} for ${details.image_heap.resources.count} resources</td>
    </tr>${debugInfoLine}
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-other-data" target="_blank">Other data</a></td>
@@ -397,23 +339,23 @@ function createReport(data: BuildOutput): string {
      <td align="left"><a href="${DOCS_BASE}#glossary-garbage-collections" target="_blank">Garbage collection</a></td>
      <td align="left">${resources.garbage_collection.total_secs.toFixed(
        2
-      )}s${gcTotalTimeRatio} in ${resources.garbage_collection.count} GCs</td>
+      )}s in ${resources.garbage_collection.count} GCs</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-peak-rss" target="_blank">Peak RSS</a></td>
      <td align="left">${bytesToHuman(
        resources.memory.peak_rss_bytes
      )} (${toPercent(
-        resources.memory.peak_rss_bytes,
-        resources.memory.system_total
-      )} of ${bytesToHuman(resources.memory.system_total)} system memory)</td>
+    resources.memory.peak_rss_bytes,
+    resources.memory.system_total
+  )} of ${bytesToHuman(resources.memory.system_total)} system memory)</td>
    </tr>
    <tr>
      <td align="left"><a href="${DOCS_BASE}#glossary-cpu-load" target="_blank">CPU load</a></td>
      <td align="left">${resources.cpu.load.toFixed(3)} (${toPercent(
-        resources.cpu.load,
-        resources.cpu.total_cores
-      )} of ${resources.cpu.total_cores} CPU cores)</td>
+    resources.cpu.load,
+    resources.cpu.total_cores
+  )} of ${resources.cpu.total_cores} CPU cores)</td>
    </tr>
  </tbody>
 </table>
@@ -436,11 +378,3 @@ function bytesToHuman(bytes: number): string {
    return `${(bytes / BYTES_TO_GiB).toFixed(2)}GB`
  }
 }
-
-function secondsToHuman(seconds: number): string {
-  if (seconds < 60) {
-    return `${seconds.toFixed(1)}s`
-  } else {
-    return `${Math.trunc(seconds / 60)}m ${Math.trunc(seconds % 60)}s`
-  }
-}
--- a/src/gds.ts
+++ b/src/gds.ts
@@ -6,7 +6,8 @@ import * as io from '@actions/io'
 import * as path from 'path'
 import * as stream from 'stream'
 import * as util from 'util'
-import {IncomingHttpHeaders, OutgoingHttpHeaders} from 'http'
+import {IHeaders} from '@actions/http-client/interfaces'
+import {IncomingHttpHeaders} from 'http'
 import {RetryHelper} from '@actions/tool-cache/lib/retry-helper'
 import {calculateSHA256} from './utils'
 import {ok} from 'assert'
@@ -31,7 +32,7 @@ export async function downloadGraalVMEELegacy(
  version: string,
  javaVersion: string
 ): Promise<string> {
-  const userAgent = `GraalVMGitHubAction/1.1.6 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
+  const userAgent = `GraalVMGitHubAction/1.1.0 (arch:${c.GRAALVM_ARCH}; os:${c.GRAALVM_PLATFORM}; java:${javaVersion})`
  const baseArtifact = await fetchArtifact(
    userAgent,
    'isBase:True',
@@ -69,11 +70,7 @@ export async function fetchArtifact(
    await response.readBody()
  ) as GDSArtifactsResponse
  if (artifactResponse.items.length !== 1) {
-    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?`
-    )
+    throw new Error(`Found more than one GDS artifact`)
  }
  return artifactResponse.items[0]
 }
@@ -131,7 +128,7 @@ class HTTPError extends Error {
 async function downloadTool(
  url: string,
  userAgent: string,
-  headers?: OutgoingHttpHeaders
+  headers?: IHeaders
 ): Promise<string> {
  const dest = path.join(getTempDirectory(), uuidv4())
  await io.mkdirP(path.dirname(dest))
@@ -168,7 +165,7 @@ async function downloadToolAttempt(
  url: string,
  userAgent: string,
  dest: string,
-  headers?: OutgoingHttpHeaders
+  headers?: IHeaders
 ): Promise<string> {
  if (fs.existsSync(dest)) {
    throw new Error(`Destination file path ${dest} already exists`)
--- a/src/graalvm.ts
+++ b/src/graalvm.ts
@@ -1,5 +1,4 @@
 import * as c from './constants'
-import * as semver from 'semver'
 import {
  downloadAndExtractJDK,
  downloadExtractAndCacheJDK,
@@ -10,6 +9,7 @@ import {
 import {downloadGraalVMEELegacy} from './gds'
 import {downloadTool} from '@actions/tool-cache'
 import {basename} from 'path'
+import {gt as semverGt, valid as semverValid} from 'semver'

 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm'
 const GRAALVM_CE_DL_BASE = `https://github.com/graalvm/${c.GRAALVM_RELEASES_REPO}/releases/download`
@@ -26,25 +26,11 @@ export async function setUpGraalVMJDK(
    return setUpGraalVMJDKDevBuild()
  }
  const javaVersion = javaVersionOrDev
-  let toolName = determineToolName(javaVersion, false)
+  const toolName = determineToolName(javaVersion, false)
  let downloadUrl: string
  if (javaVersion.includes('.')) {
-    if (semver.valid(javaVersion)) {
-      const majorJavaVersion = semver.major(javaVersion)
-      const minorJavaVersion = semver.minor(javaVersion)
-      const patchJavaVersion = semver.patch(javaVersion)
-      const isGARelease = minorJavaVersion === 0 && patchJavaVersion === 0
-      let downloadName = toolName
-      if (isGARelease) {
-        // For GA versions of JDKs, /archive/ does not use minor and patch version (see https://www.oracle.com/java/technologies/jdk-script-friendly-urls/)
-        downloadName = determineToolName(majorJavaVersion.toString(), false)
-      }
-      downloadUrl = `${GRAALVM_DL_BASE}/${majorJavaVersion}/archive/${downloadName}${c.GRAALVM_FILE_EXTENSION}`
-    } else {
-      throw new Error(
-        `java-version set to '${javaVersion}'. Please make sure the java-version is set correctly. ${c.ERROR_HINT}`
-      )
-    }
+    const majorJavaVersion = javaVersion.split('.')[0]
+    downloadUrl = `${GRAALVM_DL_BASE}/${majorJavaVersion}/archive/${toolName}${c.GRAALVM_FILE_EXTENSION}`
  } else {
    downloadUrl = `${GRAALVM_DL_BASE}/${javaVersion}/latest/${toolName}${c.GRAALVM_FILE_EXTENSION}`
  }
@@ -85,8 +71,8 @@ export async function findLatestGraalVMJDKCEJavaVersion(
  for (const matchingRef of matchingRefs) {
    const currentVersion = matchingRef.ref.substring(versionNumberStartIndex)
    if (
-      semver.valid(currentVersion) &&
-      semver.gt(currentVersion, highestVersion)
+      semverValid(currentVersion) &&
+      semverGt(currentVersion, highestVersion)
    ) {
      highestVersion = currentVersion
    }
@@ -174,11 +160,11 @@ export function findHighestJavaVersion(

 // Support for GraalVM 22.X releases and earlier

-export async function setUpGraalVMLatest_22_X(
+export async function setUpGraalVMLatest(
  gdsToken: string,
  javaVersion: string
 ): Promise<string> {
-  const lockedVersion = javaVersion === '19' ? '22.3.1' : '22.3.3'
+  const lockedVersion = '22.3.1'
  if (gdsToken.length > 0) {
    return setUpGraalVMRelease(gdsToken, lockedVersion, javaVersion)
  }
--- a/src/gu.ts
+++ b/src/gu.ts
@@ -1,6 +1,3 @@
-import * as c from './constants'
-import * as core from '@actions/core'
-import * as semver from 'semver'
 import {GRAALVM_PLATFORM} from './constants'
 import {exec} from './utils'
 import {join} from 'path'
@@ -25,42 +22,6 @@ 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
-  }
-  const coercedJavaVersion = semver.coerce(javaVersion)
-  if (
-    graalVMVersion === c.VERSION_DEV ||
-    javaVersion === c.VERSION_DEV ||
-    (coercedJavaVersion != null && semver.gte(coercedJavaVersion, '21.0.0'))
-  ) {
-    if (components.length == 1 && components[0] === 'native-image') {
-      core.warning(
-        `Please remove "components: 'native-image'" from your workflow file. It is automatically included since GraalVM for JDK 17: https://github.com/oracle/graal/pull/5995`
-      )
-    } else {
-      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[]
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,7 +1,7 @@
 import * as c from './constants'
 import * as core from '@actions/core'
 import * as graalvm from './graalvm'
-import * as semver from 'semver'
+import {gte as semverGte, valid as semverValid} 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,25 +31,16 @@ 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) {
      await setUpNativeImageMusl()
    }

-    // Download GraalVM JDK
-    const isGraalVMforJDK17OrLater =
-      distribution.length > 0 || graalVMVersion.length == 0
+    // Download or build GraalVM
    let graalVMHome
-    if (isGraalVMforJDK17OrLater) {
-      if (
-        enableCheckForUpdates &&
-        (distribution === c.DISTRIBUTION_GRAALVM ||
-          distribution === c.DISTRIBUTION_GRAALVM_COMMUNITY)
-      ) {
-        checkForUpdates(graalVMVersion, javaVersion)
-      }
+    if (distribution.length > 0 || graalvmVersion.length == 0) {
      switch (distribution) {
        case c.DISTRIBUTION_GRAALVM:
          graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
@@ -58,8 +49,9 @@ async function run(): Promise<void> {
          graalVMHome = await graalvm.setUpGraalVMJDKCE(javaVersion)
          break
        case c.DISTRIBUTION_MANDREL:
-          graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
-          break
+          throw new Error(
+            `Mandrel requires the 'version' option (see https://github.com/graalvm/setup-graalvm/tree/main#options).`
+          )
        case '':
          if (javaVersion === c.VERSION_DEV) {
            core.info(
@@ -72,25 +64,22 @@ async function run(): Promise<void> {
            )
            graalVMHome = await graalvm.setUpGraalVMJDK(javaVersion)
          }
-          break
        default:
          throw new Error(`Unsupported distribution: ${distribution}`)
      }
    } else {
-      const coercedJavaVersion = semver.coerce(javaVersion)
-      switch (graalVMVersion) {
+      switch (graalvmVersion) {
        case c.VERSION_LATEST:
          if (
            javaVersion.startsWith('17') ||
-            (coercedJavaVersion !== null &&
-              semver.gte(coercedJavaVersion, '20.0.0'))
+            (semverValid(javaVersion) && semverGte(javaVersion, '20'))
          ) {
            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 = await graalvm.setUpGraalVMJDK(javaVersion)
          } else {
-            graalVMHome = await graalvm.setUpGraalVMLatest_22_X(
+            graalVMHome = await graalvm.setUpGraalVMLatest(
              gdsToken,
              javaVersion
            )
@@ -102,28 +91,18 @@ async function run(): Promise<void> {
              'Downloading GraalVM EE dev builds is not supported'
            )
          }
-          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()
-          }
+          graalVMHome = await graalvm.setUpGraalVMJDKDevBuild()
          break
        default:
-          if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-            graalVMHome = await setUpMandrel(graalVMVersion, javaVersion)
+          if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+            graalVMHome = await setUpMandrel(graalvmVersion, javaVersion)
          } else {
            if (enableCheckForUpdates) {
-              checkForUpdates(graalVMVersion, javaVersion)
+              await checkForUpdates(graalvmVersion, javaVersion)
            }
            graalVMHome = await graalvm.setUpGraalVMRelease(
              gdsToken,
-              graalVMVersion,
+              graalvmVersion,
              javaVersion
            )
          }
@@ -139,18 +118,21 @@ async function run(): Promise<void> {
      core.exportVariable('JAVA_HOME', graalVMHome)
    }

-    await setUpGUComponents(
-      javaVersion,
-      graalVMVersion,
-      graalVMHome,
-      components,
-      gdsToken
-    )
+    // Set up GraalVM components (if any)
+    if (components.length > 0) {
+      if (graalvmVersion.startsWith(c.MANDREL_NAMESPACE)) {
+        core.warning(
+          `Mandrel does not support GraalVM components: ${componentsString}`
+        )
+      } else {
+        await setUpGUComponents(gdsToken, graalVMHome, components)
+      }
+    }

    if (cache && isCacheAvailable()) {
      await restore(cache)
    }
-    setUpNativeImageBuildReports(isGraalVMforJDK17OrLater, graalVMVersion)
+    setUpNativeImageBuildReports(graalvmVersion)
  } catch (error) {
    if (error instanceof Error) core.setFailed(error.message)
  }
--- a/src/mandrel.ts
+++ b/src/mandrel.ts
@@ -1,33 +1,27 @@
 import * as c from './constants'
-import * as httpClient from '@actions/http-client'
 import {downloadExtractAndCacheJDK, getLatestRelease} from './utils'
 import {downloadTool} from '@actions/tool-cache'
-import {basename} from 'path'

-export const MANDREL_REPO = 'mandrel'
-export const MANDREL_TAG_PREFIX = c.MANDREL_NAMESPACE
+const MANDREL_REPO = 'mandrel'
+const MANDREL_TAG_PREFIX = c.MANDREL_NAMESPACE
 const MANDREL_DL_BASE = 'https://github.com/graalvm/mandrel/releases/download'
-const DISCO_API_BASE = 'https://api.foojay.io/disco/v3.0/packages/jdks'
-
-interface JdkData {
-  message: string
-  result: any
-}

 export async function setUpMandrel(
-  mandrelVersion: string,
+  graalvmVersion: string,
  javaVersion: string
 ): Promise<string> {
-  const version = stripMandrelNamespace(mandrelVersion)
+  const mandrelVersion = graalvmVersion.substring(
+    c.MANDREL_NAMESPACE.length,
+    graalvmVersion.length
+  )
+
  let mandrelHome
-  switch (version) {
-    case '':
-    // fetch latest if no version is specified
+  switch (mandrelVersion) {
    case 'latest':
      mandrelHome = await setUpMandrelLatest(javaVersion)
      break
    default:
-      mandrelHome = await setUpMandrelRelease(version, javaVersion)
+      mandrelHome = await setUpMandrelRelease(mandrelVersion, javaVersion)
      break
  }

@@ -35,110 +29,32 @@ export async function setUpMandrel(
 }

 async function setUpMandrelLatest(javaVersion: string): Promise<string> {
-  const latest_release_url = await getLatestMandrelReleaseUrl(javaVersion)
-  const version_tag = getTagFromURI(latest_release_url)
-  const version = stripMandrelNamespace(version_tag)
-
-  const toolName = determineToolName(javaVersion)
-  return downloadExtractAndCacheJDK(
-    async () => downloadTool(latest_release_url),
-    toolName,
-    version
-  )
-}
-
-// Download URIs are of the form https://github.com/graalvm/mandrel/releases/download/<tag>/<archive-name>
-function getTagFromURI(uri: string): string {
-  const parts = uri.split('/')
-  try {
-    return parts[parts.length - 2]
-  } catch (error) {
-    throw new Error(`Failed to extract tag from URI ${uri}: ${error}`)
-  }
-}
-
-export async function getLatestMandrelReleaseUrl(
-  javaVersion: string
-): Promise<string> {
-  const url = `${DISCO_API_BASE}?jdk_version=${javaVersion}&distribution=${c.DISTRIBUTION_MANDREL}&architecture=${c.JDK_ARCH}&operating_system=${c.JDK_PLATFORM}&latest=per_distro`
-  const _http = new httpClient.HttpClient()
-  const response = await _http.getJson<JdkData>(url)
-  if (response.statusCode !== 200) {
-    throw new Error(
-      `Failed to fetch latest Mandrel release for Java ${javaVersion} from DISCO API: ${response.result}`
-    )
-  }
-  const result = response.result?.result[0]
-  try {
-    const pkg_info_uri = result.links.pkg_info_uri
-    return await getLatestMandrelReleaseUrlHelper(
-      _http,
-      javaVersion,
-      pkg_info_uri
-    )
-  } catch (error) {
-    throw new Error(
-      `Failed to get latest Mandrel release for Java ${javaVersion} from DISCO API: ${error}`
-    )
-  }
-}
-
-async function getLatestMandrelReleaseUrlHelper(
-  _http: httpClient.HttpClient,
-  java_version: string,
-  pkg_info_uri: string
-): Promise<string> {
-  const response = await _http.getJson<JdkData>(pkg_info_uri)
-  if (response.statusCode !== 200) {
-    throw new Error(
-      `Failed to fetch package info of latest Mandrel release for Java ${java_version} from DISCO API: ${response.result}`
-    )
-  }
-  const result = response.result?.result[0]
-  try {
-    return result.direct_download_uri
-  } catch (error) {
-    throw new Error(
-      `Failed to get download URI of latest Mandrel release for Java ${java_version} from DISCO API: ${error}`
+  const latestRelease = await getLatestRelease(MANDREL_REPO)
+  const tag_name = latestRelease.tag_name
+  if (tag_name.startsWith(MANDREL_TAG_PREFIX)) {
+    const latestVersion = tag_name.substring(
+      MANDREL_TAG_PREFIX.length,
+      tag_name.length
    )
+    return setUpMandrelRelease(latestVersion, javaVersion)
  }
+  throw new Error(`Could not find latest Mandrel release: ${tag_name}`)
 }

 async function setUpMandrelRelease(
  version: string,
  javaVersion: string
 ): Promise<string> {
+  const identifier = determineMandrelIdentifier(version, javaVersion)
+  const downloadUrl = `${MANDREL_DL_BASE}/${MANDREL_TAG_PREFIX}${version}/${identifier}${c.GRAALVM_FILE_EXTENSION}`
  const toolName = determineToolName(javaVersion)
  return downloadExtractAndCacheJDK(
-    async () => downloadMandrelJDK(version, javaVersion),
+    async () => downloadTool(downloadUrl),
    toolName,
    version
  )
 }

-async function downloadMandrelJDK(
-  version: string,
-  javaVersion: string
-): Promise<string> {
-  const identifier = determineMandrelIdentifier(version, javaVersion)
-  const downloadUrl = `${MANDREL_DL_BASE}/${MANDREL_TAG_PREFIX}${version}/${identifier}${c.GRAALVM_FILE_EXTENSION}`
-  try {
-    return await downloadTool(downloadUrl)
-  } catch (error) {
-    if (error instanceof Error && error.message.includes('404')) {
-      // Not Found
-      throw new Error(
-        `Failed to download ${basename(
-          downloadUrl
-        )}. Are you sure version: '${version}' and java-version: '${javaVersion}' are correct?`
-      )
-    }
-    throw new Error(
-      `Failed to download ${basename(downloadUrl)} (error: ${error}).`
-    )
-  }
-}
-
 function determineMandrelIdentifier(
  version: string,
  javaVersion: string
@@ -149,14 +65,3 @@ function determineMandrelIdentifier(
 function determineToolName(javaVersion: string): string {
  return `mandrel-java${javaVersion}-${c.GRAALVM_PLATFORM}`
 }
-
-export function stripMandrelNamespace(graalVMVersion: string) {
-  if (graalVMVersion.startsWith(c.MANDREL_NAMESPACE)) {
-    return graalVMVersion.substring(
-      c.MANDREL_NAMESPACE.length,
-      graalVMVersion.length
-    )
-  } else {
-    return graalVMVersion
-  }
-}
Author	SHA1	Message	Date
Fabio Niephaus	52b9a9b316	Bump version to `1.1.0`.	2023-06-16 13:04:28 +02:00
Fabio Niephaus	435d2b356f	Incorporate additional feedback.	2023-06-16 13:03:32 +02:00
Fabio Niephaus	6bd874f0ca	Incorporate more reviewer feedback.	2023-06-16 12:15:03 +02:00
Fabio Niephaus	be3e4f6272	Incorporate reviewer feedback.	2023-06-16 10:34:13 +02:00
Fabio Niephaus	fc45baf59f	Support new GraalVM for JDK17/JDK20 release This commit adds support for the new GraalVM for JDK17/JDK20 release, including the new Oracle GraalVM distribution. For this, users only need to specify the 'java-version' option and the new 'distribution' option. The 'version' option is now marked as optional and kept for compatibility with older GraalVM releases and Mandrel.	2023-06-16 09:19:49 +02:00
Fabio Niephaus	17d64df2bb	Temporarily disable Mandrel latest builds on Windows.	2023-06-15 17:59:26 +02:00