npm run build

.github/workflows/e2e-versions.yml

@@ -30,8 +30,7 @@ jobs:
             'microsoft',
             'semeru',
             'corretto',
-            'dragonwell',
+            'dragonwell'
-            'sapmachine'
           ] # internally 'adopt-hotspot' is the same as 'adopt'
         version: ['21', '11', '17']
         exclude:
@@ -45,22 +44,11 @@ jobs:
             version: 17
           - distribution: oracle
             os: windows-latest
-            version: 21
+            version: 20
           - distribution: oracle
             os: ubuntu-latest
-            version: 21
+            version: 20
-          - distribution: graalvm
+
-            os: macos-latest
-            version: 17
-          - distribution: graalvm
-            os: windows-latest
-            version: 21
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: 21
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: '24-ea'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -90,19 +78,13 @@ jobs:
         include:
           - distribution: oracle
             os: ubuntu-latest
-            version: '21.0.4'
+            version: '20.0.1'
-          - distribution: graalvm
-            os: ubuntu-latest
-            version: '21.0.4'
           - distribution: dragonwell
             os: ubuntu-latest
             version: '11.0'
           - distribution: dragonwell
             os: ubuntu-latest
             version: '11.0.13+9'
-          - distribution: sapmachine
-            os: ubuntu-latest
-            version: '17.0.7'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,8 +106,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution:
+        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
-          ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -151,8 +132,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-latest, windows-latest, ubuntu-latest]
-        distribution:
+        distribution: ['temurin', 'zulu', 'liberica', 'dragonwell']
-          ['temurin', 'zulu', 'liberica', 'dragonwell', 'sapmachine']
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -228,28 +208,6 @@ jobs:
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
 
-  setup-java-ea-versions-sapmachine:
-    name: sapmachine ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
-    needs: setup-java-major-minor-versions
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        version: ['17-ea', '21-ea']
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: setup-java
-        uses: ./
-        id: setup-java
-        with:
-          java-version: ${{ matrix.version }}
-          distribution: sapmachine
-      - name: Verify Java
-        run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
-        shell: bash
-
   setup-java-custom-package-type:
     name: ${{ matrix.distribution }} ${{ matrix.version }} (${{ matrix.java-package }}-x64) - ${{ matrix.os }}
     needs: setup-java-major-minor-versions
@@ -258,7 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, windows-latest, ubuntu-latest]
-        distribution: ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine']
+        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
         java-package: ['jre']
         version: ['17.0']
         include:

.github/workflows/publish-immutable-actions.yml

@@ -1,20 +0,0 @@
-name: 'Publish Immutable Action Version'
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  publish:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-      packages: write
-
-    steps:
-      - name: Checking out
-        uses: actions/checkout@v4
-      - name: Publish
-        id: publish
-        uses: actions/publish-immutable-action@0.0.3

README.md

@@ -108,8 +108,6 @@ Currently, the following distributions are supported:
 | `semeru` | IBM Semeru Runtime Open Edition | [Link](https://developer.ibm.com/languages/java/semeru-runtimes/downloads/) | [Link](https://openjdk.java.net/legal/gplv2+ce.html) |
 | `oracle` | Oracle JDK | [Link](https://www.oracle.com/java/technologies/downloads/) | [Link](https://java.com/freeuselicense)
 | `dragonwell` | Alibaba Dragonwell JDK | [Link](https://dragonwell-jdk.io/) | [Link](https://www.aliyun.com/product/dragonwell/)
-| `sapmachine` | SAP SapMachine JDK/JRE | [Link](https://sapmachine.io/) | [Link](https://github.com/SAP/SapMachine/blob/sapmachine/LICENSE)
-| `graalvm` | Oracle GraalVM | [Link](https://www.graalvm.org/) | [Link](https://www.oracle.com/downloads/licenses/graal-free-license.html)
 
 **NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
 
@@ -259,8 +257,6 @@ In the example above multiple JDKs are installed for the same job. The result af
   - [Amazon Corretto](docs/advanced-usage.md#Amazon-Corretto)
   - [Oracle](docs/advanced-usage.md#Oracle)
   - [Alibaba Dragonwell](docs/advanced-usage.md#Alibaba-Dragonwell)
-  - [SapMachine](docs/advanced-usage.md#SapMachine)
-  - [GraalVM](docs/advanced-usage.md#GraalVM)
 - [Installing custom Java package type](docs/advanced-usage.md#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](docs/advanced-usage.md#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](docs/advanced-usage.md#Installing-Java-from-local-file)

__tests__/distributors/graalvm-installer.test.ts

@@ -1,152 +0,0 @@
-import {GraalVMDistribution} from '../../src/distributions/graalvm/installer';
-import os from 'os';
-import * as core from '@actions/core';
-import {getDownloadArchiveExtension} from '../../src/util';
-import {HttpClient} from '@actions/http-client';
-
-describe('findPackageForDownload', () => {
-  let distribution: GraalVMDistribution;
-  let spyDebug: jest.SpyInstance;
-  let spyHttpClient: jest.SpyInstance;
-
-  beforeEach(() => {
-    distribution = new GraalVMDistribution({
-      version: '',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-
-    spyDebug = jest.spyOn(core, 'debug');
-    spyDebug.mockImplementation(() => {});
-  });
-
-  it.each([
-    [
-      '21',
-      '21',
-      'https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '21.0.4',
-      '21.0.4',
-      'https://download.oracle.com/graalvm/21/archive/graalvm-jdk-21.0.4_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17',
-      '17',
-      'https://download.oracle.com/graalvm/17/latest/graalvm-jdk-17_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ],
-    [
-      '17.0.12',
-      '17.0.12',
-      'https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.12_{{OS_TYPE}}-x64_bin.{{ARCHIVE_TYPE}}'
-    ]
-  ])('version is %s -> %s', async (input, expectedVersion, expectedUrl) => {
-    /* Needed only for this particular test because /latest/ urls tend to change */
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
-    spyHttpClient.mockReturnValue(
-      Promise.resolve({
-        message: {
-          statusCode: 200
-        }
-      })
-    );
-
-    const result = await distribution['findPackageForDownload'](input);
-
-    jest.restoreAllMocks();
-
-    expect(result.version).toBe(expectedVersion);
-    const osType = distribution.getPlatform();
-    const archiveType = getDownloadArchiveExtension();
-    const url = expectedUrl
-      .replace('{{OS_TYPE}}', osType)
-      .replace('{{ARCHIVE_TYPE}}', archiveType);
-    expect(result.url).toBe(url);
-  });
-
-  it.each([
-    [
-      '24-ea',
-      /^https:\/\/github\.com\/graalvm\/oracle-graalvm-ea-builds\/releases\/download\/jdk-24\.0\.0-ea\./
-    ]
-  ])('version is %s -> %s', async (version, expectedUrlPrefix) => {
-    /* Needed only for this particular test because /latest/ urls tend to change */
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'head');
-    spyHttpClient.mockReturnValue(
-      Promise.resolve({
-        message: {
-          statusCode: 200
-        }
-      })
-    );
-
-    const eaDistro = new GraalVMDistribution({
-      version,
-      architecture: '', // to get default value
-      packageType: 'jdk',
-      checkLatest: false
-    });
-
-    const versionWithoutEA = version.split('-')[0];
-    const result = await eaDistro['findPackageForDownload'](versionWithoutEA);
-
-    jest.restoreAllMocks();
-
-    expect(result.url).toEqual(expect.stringMatching(expectedUrlPrefix));
-  });
-
-  it.each([
-    ['amd64', 'x64'],
-    ['arm64', 'aarch64']
-  ])(
-    'defaults to os.arch(): %s mapped to distro arch: %s',
-    async (osArch: string, distroArch: string) => {
-      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-      jest.spyOn(os, 'platform').mockReturnValue('linux');
-
-      const version = '21';
-      const distro = new GraalVMDistribution({
-        version,
-        architecture: '', // to get default value
-        packageType: 'jdk',
-        checkLatest: false
-      });
-
-      const osType = distribution.getPlatform();
-      if (osType === 'windows' && distroArch == 'aarch64') {
-        return; // skip, aarch64 is not available for Windows
-      }
-      const archiveType = getDownloadArchiveExtension();
-      const result = await distro['findPackageForDownload'](version);
-      const expectedUrl = `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`;
-
-      expect(result.url).toBe(expectedUrl);
-    }
-  );
-
-  it('should throw an error', async () => {
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /GraalVM is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('11')).rejects.toThrow(
-      /GraalVM is only supported for JDK 17 and later/
-    );
-    await expect(distribution['findPackageForDownload']('18')).rejects.toThrow(
-      /Could not find GraalVM for SemVer */
-    );
-
-    const unavailableEADistro = new GraalVMDistribution({
-      version: '17-ea',
-      architecture: '', // to get default value
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    await expect(
-      unavailableEADistro['findPackageForDownload']('17')
-    ).rejects.toThrow(
-      /No GraalVM EA build found\. Are you sure java-version: '17-ea' is correct\?/
-    );
-  });
-});

__tests__/distributors/sapmachine-installer.test.ts

@@ -1,294 +0,0 @@
-import {HttpClient} from '@actions/http-client';
-import {SapMachineDistribution} from '../../src/distributions/sapmachine/installer';
-import * as utils from '../../src/util';
-
-import manifestData from '../data/sapmachine.json';
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-  let spyUtilGetDownloadArchiveExtension: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: manifestData
-    });
-
-    spyUtilGetDownloadArchiveExtension = jest.spyOn(
-      utils,
-      'getDownloadArchiveExtension'
-    );
-    spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  const mockPlatform = (
-    distribution: SapMachineDistribution,
-    platform: string
-  ) => {
-    distribution['getPlatformOption'] = () => platform;
-    const mockedExtension = platform == 'windows' ? 'zip' : 'tar.gz';
-    spyUtilGetDownloadArchiveExtension.mockReturnValue(mockedExtension);
-  };
-
-  describe('shouldFallbackToBackupUrl', () => {
-    it('should return correct release when the primary URL is not available', async () => {
-      spyHttpClient.mockReturnValueOnce({
-        statusCode: 404,
-        headers: {},
-        result: ''
-      });
-      spyHttpClient.mockReturnValueOnce({
-        statusCode: 200,
-        headers: {},
-        result: manifestData
-      });
-
-      const version = '17';
-      const distribution = new SapMachineDistribution({
-        version: version,
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      });
-
-      mockPlatform(distribution, 'linux');
-
-      const availableVersion = await distribution['findPackageForDownload'](
-        version
-      );
-      expect(availableVersion).not.toBeNull();
-      expect(availableVersion.url).toBe(
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64_bin.tar.gz'
-      );
-    });
-  });
-
-  describe('getAvailableVersions', () => {
-    it.each([
-      ['11', 'x64', 'linux', 71],
-      ['11', 'aarch64', 'linux', 54],
-      ['17', 'riscv', 'linux', 0],
-      ['16.0.1', 'x64', 'linux', 71],
-      ['23-ea', 'x64', 'linux', 798],
-      ['23-ea', 'aarch64', 'windows', 0],
-      ['23-ea', 'x64', 'windows', 750]
-    ])(
-      'should get right number of available versions from JSON',
-      async (
-        jdkVersion: string,
-        arch: string,
-        platform: string,
-        len: number
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: jdkVersion,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersions = await distribution['getAvailableVersions']();
-        expect(availableVersions).not.toBeNull();
-        expect(availableVersions.length).toBe(len);
-      }
-    );
-  });
-
-  describe('findPackageForDownload', () => {
-    it.each([
-      [
-        '11',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_linux-x64_bin.tar.gz'
-      ],
-      [
-        '11',
-        'linux',
-        'aarch64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '11',
-        'windows',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.22/sapmachine-jdk-11.0.22_windows-x64_bin.zip'
-      ],
-      [
-        '11.0.17',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.17/sapmachine-jdk-11.0.17_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'aarch64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'windows',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_windows-x64_bin.zip'
-      ],
-      [
-        '17.0.4',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.4.1/sapmachine-jdk-17.0.4.1_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_linux-x64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'linux',
-        'aarch64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_linux-aarch64_bin.tar.gz'
-      ],
-      [
-        '17',
-        'windows',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jre-17.0.10_windows-x64_bin.zip'
-      ],
-      [
-        '17.0.4',
-        'linux',
-        'x64',
-        'jre',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.4.1/sapmachine-jre-17.0.4.1_linux-x64_bin.tar.gz'
-      ],
-      [
-        '23-ea',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-23%2B15/sapmachine-jdk-23-ea.15_linux-x64_bin.tar.gz',
-        '23'
-      ],
-      [
-        '21.0.2+2-ea',
-        'linux',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-21.0.2%2B2/sapmachine-jdk-21.0.2-ea.2_linux-x64_bin.tar.gz',
-        '21.0.2+2'
-      ],
-      [
-        '17',
-        'linux-musl',
-        'x64',
-        'jdk',
-        'https://github.com/SAP/SapMachine/releases/download/sapmachine-17.0.10/sapmachine-jdk-17.0.10_linux-x64-musl_bin.tar.gz'
-      ]
-    ])(
-      'should return proper link according to the specified java-version, platform and arch',
-      async (
-        version: string,
-        platform: string,
-        arch: string,
-        packageType: string,
-        expectedLink: string,
-        normalizedVersion: string = version
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: version,
-          architecture: arch,
-          packageType: packageType,
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        const availableVersion = await distribution['findPackageForDownload'](
-          normalizedVersion
-        );
-        expect(availableVersion).not.toBeNull();
-        expect(availableVersion.url).toBe(expectedLink);
-      }
-    );
-
-    it.each([
-      ['8', 'linux', 'x64'],
-      ['8', 'macos', 'aarch64'],
-      ['23', 'macos', 'aarch64'],
-      ['17', 'linux', 'riscv'],
-      ['23', 'linux', 'x64'],
-      ['25-ea', 'linux', 'x64', '25'],
-      ['8-ea', 'linux', 'x64', '8'],
-      ['21.0.3+7', 'linux', 'x64', '21.0.3+7'],
-      ['21.0.3+8-ea', 'linux', 'x64', '21.0.3+8'],
-      ['17', 'linux-muse', 'aarch64']
-    ])(
-      'should throw when required version of JDK can not be found in the JSON',
-      async (
-        version: string,
-        platform: string,
-        arch: string,
-        normalizedVersion: string = version
-      ) => {
-        const distribution = new SapMachineDistribution({
-          version: version,
-          architecture: arch,
-          packageType: 'jdk',
-          checkLatest: false
-        });
-        mockPlatform(distribution, platform);
-
-        await expect(
-          distribution['findPackageForDownload'](normalizedVersion)
-        ).rejects.toThrow(
-          `Couldn't find any satisfied version for the specified java-version: "${normalizedVersion}" and architecture: "${arch}".`
-        );
-      }
-    );
-
-    it('should throw when required package type is not supported', async () => {
-      const jdkVersion = '17';
-      const arch = 'x64';
-      const platform = 'linux';
-      const distribution = new SapMachineDistribution({
-        version: jdkVersion,
-        architecture: arch,
-        packageType: 'jdk+fx',
-        checkLatest: false
-      });
-      mockPlatform(distribution, platform);
-      await expect(
-        distribution['findPackageForDownload'](jdkVersion)
-      ).rejects.toThrow(
-        'SapMachine provides only the `jdk` and `jre` package type'
-      );
-    });
-  });
-});

__tests__/distributors/semeru-installer.test.ts

@@ -207,7 +207,7 @@ describe('findPackageForDownload', () => {
       });
       distribution['getAvailableVersions'] = async () => [];
       await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-        `Unsupported architecture for IBM Semeru: ${arch} for your current OS version, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
+        `Unsupported architecture for IBM Semeru: ${arch}, the following are supported: x64, x86, ppc64le, ppc64, s390x, aarch64`
       );
     }
   );

dist/cleanup/index.js

@@ -88116,7 +88116,7 @@ function computeCacheKey(packageManager, cacheDependencyPath) {
         if (!fileHash) {
             throw new Error(`No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`);
         }
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
     });
 }
 /**

dist/setup/index.js

@@ -123365,7 +123365,7 @@ function computeCacheKey(packageManager, cacheDependencyPath) {
         if (!fileHash) {
             throw new Error(`No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`);
         }
-        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+        return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
     });
 }
 /**
@@ -123961,7 +123961,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const arch = this.distributionArchitecture();
             const imageType = this.packageType;
             if (core.isDebug()) {
-                console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
             }
             const availableVersionsUrl = 'https://corretto.github.io/corretto-downloads/latest_links/indexmap_with_checksum.json';
             const fetchCurrentVersions = yield this.http.getJson(availableVersionsUrl);
@@ -123973,7 +123973,7 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
             const availableVersions = this.getAvailableVersionsForPlatform(eligibleVersions);
             if (core.isDebug()) {
                 core.startGroup('Print information about available versions');
-                console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+                console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
                 core.debug(`Available versions: [${availableVersions.length}]`);
                 core.debug(availableVersions
                     .map(item => `${item.version}: ${item.correttoVersion}`)
@@ -124049,8 +124049,6 @@ const installer_7 = __nccwpck_require__(41121);
 const installer_8 = __nccwpck_require__(34750);
 const installer_9 = __nccwpck_require__(64298);
 const installer_10 = __nccwpck_require__(16132);
-const installer_11 = __nccwpck_require__(52869);
-const installer_12 = __nccwpck_require__(55644);
 var JavaDistribution;
 (function (JavaDistribution) {
     JavaDistribution["Adopt"] = "adopt";
@@ -124065,8 +124063,6 @@ var JavaDistribution;
     JavaDistribution["Corretto"] = "corretto";
     JavaDistribution["Oracle"] = "oracle";
     JavaDistribution["Dragonwell"] = "dragonwell";
-    JavaDistribution["SapMachine"] = "sapmachine";
-    JavaDistribution["GraalVM"] = "graalvm";
 })(JavaDistribution || (JavaDistribution = {}));
 function getJavaDistribution(distributionName, installerOptions, jdkFile) {
     switch (distributionName) {
@@ -124093,10 +124089,6 @@ function getJavaDistribution(distributionName, installerOptions, jdkFile) {
             return new installer_9.OracleDistribution(installerOptions);
         case JavaDistribution.Dragonwell:
             return new installer_10.DragonwellDistribution(installerOptions);
-        case JavaDistribution.SapMachine:
-            return new installer_11.SapMachineDistribution(installerOptions);
-        case JavaDistribution.GraalVM:
-            return new installer_12.GraalVMDistribution(installerOptions);
         default:
             return null;
     }
@@ -124314,172 +124306,6 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
 exports.DragonwellDistribution = DragonwellDistribution;
 
 
-/***/ }),
-
-/***/ 55644:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.GraalVMDistribution = void 0;
-const core = __importStar(__nccwpck_require__(42186));
-const tc = __importStar(__nccwpck_require__(27784));
-const fs_1 = __importDefault(__nccwpck_require__(57147));
-const path_1 = __importDefault(__nccwpck_require__(71017));
-const base_installer_1 = __nccwpck_require__(59741);
-const util_1 = __nccwpck_require__(92629);
-const http_client_1 = __nccwpck_require__(96255);
-const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
-const IS_WINDOWS = process.platform === 'win32';
-const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
-class GraalVMDistribution extends base_installer_1.JavaBase {
-    constructor(installerOptions) {
-        super('GraalVM', installerOptions);
-    }
-    downloadTool(javaRelease) {
-        return __awaiter(this, void 0, void 0, function* () {
-            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extension = (0, util_1.getDownloadArchiveExtension)();
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
-            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
-            const archivePath = path_1.default.join(extractedJavaPath, archiveName);
-            const version = this.getToolcacheVersionName(javaRelease.version);
-            const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-            return { version: javaRelease.version, path: javaPath };
-        });
-    }
-    findPackageForDownload(range) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const arch = this.distributionArchitecture();
-            if (arch !== 'x64' && arch !== 'aarch64') {
-                throw new Error(`Unsupported architecture: ${this.architecture}`);
-            }
-            if (!this.stable) {
-                return this.findEABuildDownloadUrl(`${range}-ea`);
-            }
-            if (this.packageType !== 'jdk') {
-                throw new Error('GraalVM provides only the `jdk` package type');
-            }
-            const platform = this.getPlatform();
-            const extension = (0, util_1.getDownloadArchiveExtension)();
-            let major;
-            let fileUrl;
-            if (range.includes('.')) {
-                major = range.split('.')[0];
-                fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-            }
-            else {
-                major = range;
-                fileUrl = `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-            }
-            if (parseInt(major) < 17) {
-                throw new Error('GraalVM is only supported for JDK 17 and later');
-            }
-            const response = yield this.http.head(fileUrl);
-            if (response.message.statusCode === http_client_1.HttpCodes.NotFound) {
-                throw new Error(`Could not find GraalVM for SemVer ${range}`);
-            }
-            if (response.message.statusCode !== http_client_1.HttpCodes.OK) {
-                throw new Error(`Http request for GraalVM failed with status code: ${response.message.statusCode}`);
-            }
-            return { url: fileUrl, version: range };
-        });
-    }
-    findEABuildDownloadUrl(javaEaVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const versions = yield this.fetchEAJson(javaEaVersion);
-            const latestVersion = versions.find(v => v.latest);
-            if (!latestVersion) {
-                throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
-            }
-            const arch = this.distributionArchitecture();
-            const file = latestVersion.files.find(f => f.arch === arch && f.platform === GRAALVM_PLATFORM);
-            if (!file || !file.filename.startsWith('graalvm-jdk-')) {
-                throw new Error(`Unable to find file metadata for '${javaEaVersion}'`);
-            }
-            return {
-                url: `${latestVersion.download_base_url}${file.filename}`,
-                version: latestVersion.version
-            };
-        });
-    }
-    fetchEAJson(javaEaVersion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const owner = 'graalvm';
-            const repository = 'oracle-graalvm-ea-builds';
-            const branch = 'main';
-            const filePath = `versions/${javaEaVersion}.json`;
-            const url = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
-            const headers = (0, util_1.getGitHubHttpHeaders)();
-            core.debug(`Trying to fetch available version info for GraalVM EA builds from '${url}'`);
-            let fetchedJson;
-            try {
-                fetchedJson = (yield this.http.getJson(url, headers))
-                    .result;
-            }
-            catch (err) {
-                throw Error(`Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${err.message}`);
-            }
-            if (fetchedJson === null) {
-                throw Error(`No GraalVM EA build found. Are you sure java-version: '${javaEaVersion}' is correct?`);
-            }
-            return fetchedJson;
-        });
-    }
-    getPlatform(platform = process.platform) {
-        switch (platform) {
-            case 'darwin':
-                return 'macos';
-            case 'win32':
-                return 'windows';
-            case 'linux':
-                return 'linux';
-            default:
-                throw new Error(`Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`);
-        }
-    }
-}
-exports.GraalVMDistribution = GraalVMDistribution;
-
-
 /***/ }),
 
 /***/ 40883:
@@ -125048,219 +124874,6 @@ class OracleDistribution extends base_installer_1.JavaBase {
 exports.OracleDistribution = OracleDistribution;
 
 
-/***/ }),
-
-/***/ 52869:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.SapMachineDistribution = void 0;
-const core = __importStar(__nccwpck_require__(42186));
-const tc = __importStar(__nccwpck_require__(27784));
-const semver_1 = __importDefault(__nccwpck_require__(11383));
-const fs_1 = __importDefault(__nccwpck_require__(57147));
-const path_1 = __importDefault(__nccwpck_require__(71017));
-const util_1 = __nccwpck_require__(92629);
-const base_installer_1 = __nccwpck_require__(59741);
-class SapMachineDistribution extends base_installer_1.JavaBase {
-    constructor(installerOptions) {
-        super('SapMachine', installerOptions);
-    }
-    findPackageForDownload(version) {
-        return __awaiter(this, void 0, void 0, function* () {
-            core.debug(`Only stable versions: ${this.stable}`);
-            if (!['jdk', 'jre'].includes(this.packageType)) {
-                throw new Error('SapMachine provides only the `jdk` and `jre` package type');
-            }
-            const availableVersions = yield this.getAvailableVersions();
-            const matchedVersions = availableVersions
-                .filter(item => {
-                return (0, util_1.isVersionSatisfies)(version, item.version);
-            })
-                .map(item => {
-                return {
-                    version: item.version,
-                    url: item.downloadLink
-                };
-            });
-            if (!matchedVersions.length) {
-                throw new Error(`Couldn't find any satisfied version for the specified java-version: "${version}" and architecture: "${this.architecture}".`);
-            }
-            const resolvedVersion = matchedVersions[0];
-            return resolvedVersion;
-        });
-    }
-    getAvailableVersions() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = this.getPlatformOption();
-            const arch = this.distributionArchitecture();
-            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
-            if (!fetchedReleasesJson) {
-                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages', (0, util_1.getGitHubHttpHeaders)());
-            }
-            if (!fetchedReleasesJson) {
-                throw new Error(`Couldn't fetch SapMachine versions information from both primary and backup urls`);
-            }
-            core.debug('Successfully fetched information about available SapMachine versions');
-            const availableVersions = this.parseVersions(platform, arch, fetchedReleasesJson);
-            if (core.isDebug()) {
-                core.startGroup('Print information about available versions');
-                core.debug(availableVersions.map(item => item.version).join(', '));
-                core.endGroup();
-            }
-            return availableVersions;
-        });
-    }
-    downloadTool(javaRelease) {
-        return __awaiter(this, void 0, void 0, function* () {
-            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
-            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
-            const archivePath = path_1.default.join(extractedJavaPath, archiveName);
-            const version = this.getToolcacheVersionName(javaRelease.version);
-            const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-            return { version: javaRelease.version, path: javaPath };
-        });
-    }
-    parseVersions(platform, arch, versions) {
-        const eligibleVersions = [];
-        for (const [, majorVersionMap] of Object.entries(versions)) {
-            for (const [, jdkVersionMap] of Object.entries(majorVersionMap.updates)) {
-                for (const [buildVersion, buildVersionMap] of Object.entries(jdkVersionMap)) {
-                    let buildVersionWithoutPrefix = buildVersion.replace('sapmachine-', '');
-                    if (!buildVersionWithoutPrefix.includes('.')) {
-                        // replace major version with major.minor.patch and keep the remaining build identifier after the + as is with regex
-                        buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(/(\d+)(\+.*)?/, '$1.0.0$2');
-                    }
-                    // replace + with . to convert to semver format if we have more than 3 version digits
-                    if (buildVersionWithoutPrefix.split('.').length > 3) {
-                        buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace('+', '.');
-                    }
-                    buildVersionWithoutPrefix = (0, util_1.convertVersionToSemver)(buildVersionWithoutPrefix);
-                    // ignore invalid version
-                    if (!semver_1.default.valid(buildVersionWithoutPrefix)) {
-                        core.debug(`Invalid version: ${buildVersionWithoutPrefix}`);
-                        continue;
-                    }
-                    // skip earlyAccessVersions if stable version requested
-                    if (this.stable && buildVersionMap.ea === 'true') {
-                        continue;
-                    }
-                    for (const [edition, editionAssets] of Object.entries(buildVersionMap.assets)) {
-                        if (this.packageType !== edition) {
-                            continue;
-                        }
-                        for (const [archAndPlatForm, archAssets] of Object.entries(editionAssets)) {
-                            let expectedArchAndPlatform = `${platform}-${arch}`;
-                            if (platform === 'linux-musl') {
-                                expectedArchAndPlatform = `linux-${arch}-musl`;
-                            }
-                            if (archAndPlatForm !== expectedArchAndPlatform) {
-                                continue;
-                            }
-                            for (const [contentType, contentTypeAssets] of Object.entries(archAssets)) {
-                                // skip if not tar.gz and zip files
-                                if (contentType !== 'tar.gz' && contentType !== 'zip') {
-                                    continue;
-                                }
-                                eligibleVersions.push({
-                                    os: platform,
-                                    architecture: arch,
-                                    version: buildVersionWithoutPrefix,
-                                    checksum: contentTypeAssets.checksum,
-                                    downloadLink: contentTypeAssets.url,
-                                    packageType: edition
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        const sortedVersions = this.sortParsedVersions(eligibleVersions);
-        return sortedVersions;
-    }
-    // Sorts versions in descending order as by default data in JSON isn't sorted
-    sortParsedVersions(eligibleVersions) {
-        const sortedVersions = eligibleVersions.sort((versionObj1, versionObj2) => {
-            const version1 = versionObj1.version;
-            const version2 = versionObj2.version;
-            return semver_1.default.compareBuild(version1, version2);
-        });
-        return sortedVersions.reverse();
-    }
-    getPlatformOption() {
-        switch (process.platform) {
-            case 'win32':
-                return 'windows';
-            case 'darwin':
-                return 'macos';
-            case 'linux':
-                // figure out if alpine/musl
-                if (fs_1.default.existsSync('/etc/alpine-release')) {
-                    return 'linux-musl';
-                }
-                return 'linux';
-            default:
-                return process.platform;
-        }
-    }
-    fetchReleasesFromUrl(url, headers = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                core.debug(`Trying to fetch available SapMachine versions info from the primary url: ${url}`);
-                const releases = (yield this.http.getJson(url, headers)).result;
-                return releases;
-            }
-            catch (err) {
-                core.debug(`Fetching SapMachine versions info from the link: ${url} ended up with the error: ${err.message}`);
-                return null;
-            }
-        });
-    }
-}
-exports.SapMachineDistribution = SapMachineDistribution;
-
-
 /***/ }),
 
 /***/ 41121:
@@ -125326,9 +124939,8 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     }
     findPackageForDownload(version) {
         return __awaiter(this, void 0, void 0, function* () {
-            const arch = this.distributionArchitecture();
+            if (!supportedArchitectures.includes(this.architecture)) {
-            if (!supportedArchitectures.includes(arch)) {
+                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture}, the following are supported: ${supportedArchitectures.join(', ')}`);
-                throw new Error(`Unsupported architecture for IBM Semeru: ${this.architecture} for your current OS version, the following are supported: ${supportedArchitectures.join(', ')}`);
             }
             if (!this.stable) {
                 throw new Error('IBM Semeru does not provide builds for early access versions');
@@ -125362,7 +124974,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
                 const availableOptionsMessage = availableOptions
                     ? `\nAvailable versions: ${availableOptions}`
                     : '';
-                throw new Error(`Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`);
+                throw new Error(`Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`);
             }
             return resolvedFullVersion;
         });
@@ -125387,7 +124999,7 @@ class SemeruDistribution extends base_installer_1.JavaBase {
     getAvailableVersions() {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
-            const arch = this.distributionArchitecture();
+            const arch = this.architecture;
             const imageType = this.packageType;
             const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
             const releaseType = this.stable ? 'ga' : 'ea';

docs/advanced-usage.md

@@ -8,8 +8,6 @@
   - [Amazon Corretto](#Amazon-Corretto)
   - [Oracle](#Oracle)
   - [Alibaba Dragonwell](#Alibaba-Dragonwell)
-  - [SapMachine](#SapMachine)
-  - [GraalVM](#GraalVM)
 - [Installing custom Java package type](#Installing-custom-Java-package-type)
 - [Installing custom Java architecture](#Installing-custom-Java-architecture)
 - [Installing custom Java distribution from local file](#Installing-Java-from-local-file)
@@ -144,33 +142,6 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
-### SapMachine
-**NOTE:** An OpenJDK release maintained and supported by SAP
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'sapmachine'
-    java-version: '21'
-- run: java -cp java HelloWorldApp
-```
-
-### GraalVM
-**NOTE:** Oracle GraalVM is only available for JDK 17 and later.
-
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'graalvm'
-    java-version: '21'
-- run: |
-    java -cp java HelloWorldApp
-    native-image -cp java HelloWorldApp
-```
-
 ## Installing custom Java package type
 ```yaml
 steps:

src/cache.ts

@@ -98,7 +98,7 @@ async function computeCacheKey(
       `No file in ${process.cwd()} matched to [${pattern}], make sure you have checked out the target repository`
     );
   }
-  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${process.arch}-${packageManager.id}-${fileHash}`;
+  return `${CACHE_KEY_PREFIX}-${process.env['RUNNER_OS']}-${packageManager.id}-${fileHash}`;
 }
 
 /**

src/distributions/corretto/installer.ts

@@ -93,7 +93,7 @@ export class CorrettoDistribution extends JavaBase {
     const imageType = this.packageType;
 
     if (core.isDebug()) {
-      console.time('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.time('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
     }
 
     const availableVersionsUrl =
@@ -116,7 +116,7 @@ export class CorrettoDistribution extends JavaBase {
 
     if (core.isDebug()) {
       core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for Corretto took'); // eslint-disable-line no-console
+      console.timeEnd('Retrieving available versions for Coretto took'); // eslint-disable-line no-console
       core.debug(`Available versions: [${availableVersions.length}]`);
       core.debug(
         availableVersions

src/distributions/distribution-factory.ts

@@ -10,8 +10,6 @@ import {SemeruDistribution} from './semeru/installer';
 import {CorrettoDistribution} from './corretto/installer';
 import {OracleDistribution} from './oracle/installer';
 import {DragonwellDistribution} from './dragonwell/installer';
-import {SapMachineDistribution} from './sapmachine/installer';
-import {GraalVMDistribution} from './graalvm/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
@@ -25,9 +23,7 @@ enum JavaDistribution {
   Semeru = 'semeru',
   Corretto = 'corretto',
   Oracle = 'oracle',
-  Dragonwell = 'dragonwell',
+  Dragonwell = 'dragonwell'
-  SapMachine = 'sapmachine',
-  GraalVM = 'graalvm'
 }
 
 export function getJavaDistribution(
@@ -68,10 +64,6 @@ export function getJavaDistribution(
       return new OracleDistribution(installerOptions);
     case JavaDistribution.Dragonwell:
       return new DragonwellDistribution(installerOptions);
-    case JavaDistribution.SapMachine:
-      return new SapMachineDistribution(installerOptions);
-    case JavaDistribution.GraalVM:
-      return new GraalVMDistribution(installerOptions);
     default:
       return null;
   }

src/distributions/graalvm/installer.ts

@@ -1,173 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-
-import fs from 'fs';
-import path from 'path';
-
-import {JavaBase} from '../base-installer';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  getGitHubHttpHeaders
-} from '../../util';
-import {HttpCodes} from '@actions/http-client';
-import {GraalVMEAVersion} from './models';
-
-const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
-const IS_WINDOWS = process.platform === 'win32';
-const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
-
-export class GraalVMDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('GraalVM', installerOptions);
-  }
-
-  protected async downloadTool(
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
-
-    return {version: javaRelease.version, path: javaPath};
-  }
-
-  protected async findPackageForDownload(
-    range: string
-  ): Promise<JavaDownloadRelease> {
-    const arch = this.distributionArchitecture();
-    if (arch !== 'x64' && arch !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
-    }
-
-    if (!this.stable) {
-      return this.findEABuildDownloadUrl(`${range}-ea`);
-    }
-
-    if (this.packageType !== 'jdk') {
-      throw new Error('GraalVM provides only the `jdk` package type');
-    }
-
-    const platform = this.getPlatform();
-    const extension = getDownloadArchiveExtension();
-    let major;
-    let fileUrl;
-    if (range.includes('.')) {
-      major = range.split('.')[0];
-      fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    } else {
-      major = range;
-      fileUrl = `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
-    }
-
-    if (parseInt(major) < 17) {
-      throw new Error('GraalVM is only supported for JDK 17 and later');
-    }
-
-    const response = await this.http.head(fileUrl);
-
-    if (response.message.statusCode === HttpCodes.NotFound) {
-      throw new Error(`Could not find GraalVM for SemVer ${range}`);
-    }
-
-    if (response.message.statusCode !== HttpCodes.OK) {
-      throw new Error(
-        `Http request for GraalVM failed with status code: ${response.message.statusCode}`
-      );
-    }
-
-    return {url: fileUrl, version: range};
-  }
-
-  private async findEABuildDownloadUrl(
-    javaEaVersion: string
-  ): Promise<JavaDownloadRelease> {
-    const versions = await this.fetchEAJson(javaEaVersion);
-    const latestVersion = versions.find(v => v.latest);
-    if (!latestVersion) {
-      throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
-    }
-    const arch = this.distributionArchitecture();
-    const file = latestVersion.files.find(
-      f => f.arch === arch && f.platform === GRAALVM_PLATFORM
-    );
-    if (!file || !file.filename.startsWith('graalvm-jdk-')) {
-      throw new Error(`Unable to find file metadata for '${javaEaVersion}'`);
-    }
-    return {
-      url: `${latestVersion.download_base_url}${file.filename}`,
-      version: latestVersion.version
-    };
-  }
-
-  private async fetchEAJson(
-    javaEaVersion: string
-  ): Promise<GraalVMEAVersion[]> {
-    const owner = 'graalvm';
-    const repository = 'oracle-graalvm-ea-builds';
-    const branch = 'main';
-    const filePath = `versions/${javaEaVersion}.json`;
-
-    const url = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
-
-    const headers = getGitHubHttpHeaders();
-
-    core.debug(
-      `Trying to fetch available version info for GraalVM EA builds from '${url}'`
-    );
-    let fetchedJson;
-    try {
-      fetchedJson = (await this.http.getJson<GraalVMEAVersion[]>(url, headers))
-        .result;
-    } catch (err) {
-      throw Error(
-        `Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${
-          (err as Error).message
-        }`
-      );
-    }
-    if (fetchedJson === null) {
-      throw Error(
-        `No GraalVM EA build found. Are you sure java-version: '${javaEaVersion}' is correct?`
-      );
-    }
-    return fetchedJson;
-  }
-
-  public getPlatform(platform: NodeJS.Platform = process.platform): OsVersions {
-    switch (platform) {
-      case 'darwin':
-        return 'macos';
-      case 'win32':
-        return 'windows';
-      case 'linux':
-        return 'linux';
-      default:
-        throw new Error(
-          `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
-        );
-    }
-  }
-}

src/distributions/graalvm/models.ts

@@ -1,14 +0,0 @@
-export type OsVersions = 'linux' | 'macos' | 'windows';
-
-export interface GraalVMEAFile {
-  filename: string;
-  arch: 'aarch64' | 'x64';
-  platform: 'darwin' | 'linux' | 'windows';
-}
-
-export interface GraalVMEAVersion {
-  version: string;
-  latest?: boolean;
-  download_base_url: string;
-  files: GraalVMEAFile[];
-}

src/distributions/sapmachine/installer.ts

@@ -1,268 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-import semver from 'semver';
-import fs from 'fs';
-import {OutgoingHttpHeaders} from 'http';
-import path from 'path';
-import {
-  convertVersionToSemver,
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
-  isVersionSatisfies
-} from '../../util';
-import {JavaBase} from '../base-installer';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {ISapMachineAllVersions, ISapMachineVersions} from './models';
-
-export class SapMachineDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('SapMachine', installerOptions);
-  }
-
-  protected async findPackageForDownload(
-    version: string
-  ): Promise<JavaDownloadRelease> {
-    core.debug(`Only stable versions: ${this.stable}`);
-
-    if (!['jdk', 'jre'].includes(this.packageType)) {
-      throw new Error(
-        'SapMachine provides only the `jdk` and `jre` package type'
-      );
-    }
-
-    const availableVersions = await this.getAvailableVersions();
-
-    const matchedVersions = availableVersions
-      .filter(item => {
-        return isVersionSatisfies(version, item.version);
-      })
-      .map(item => {
-        return {
-          version: item.version,
-          url: item.downloadLink
-        } as JavaDownloadRelease;
-      });
-
-    if (!matchedVersions.length) {
-      throw new Error(
-        `Couldn't find any satisfied version for the specified java-version: "${version}" and architecture: "${this.architecture}".`
-      );
-    }
-
-    const resolvedVersion = matchedVersions[0];
-    return resolvedVersion;
-  }
-
-  private async getAvailableVersions(): Promise<ISapMachineVersions[]> {
-    const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
-
-    let fetchedReleasesJson = await this.fetchReleasesFromUrl(
-      'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
-    );
-
-    if (!fetchedReleasesJson) {
-      fetchedReleasesJson = await this.fetchReleasesFromUrl(
-        'https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages',
-        getGitHubHttpHeaders()
-      );
-    }
-
-    if (!fetchedReleasesJson) {
-      throw new Error(
-        `Couldn't fetch SapMachine versions information from both primary and backup urls`
-      );
-    }
-
-    core.debug(
-      'Successfully fetched information about available SapMachine versions'
-    );
-
-    const availableVersions = this.parseVersions(
-      platform,
-      arch,
-      fetchedReleasesJson
-    );
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      core.debug(availableVersions.map(item => item.version).join(', '));
-      core.endGroup();
-    }
-
-    return availableVersions;
-  }
-
-  protected async downloadTool(
-    javaRelease: JavaDownloadRelease
-  ): Promise<JavaInstallerResults> {
-    core.info(
-      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
-    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
-
-    const archiveName = fs.readdirSync(extractedJavaPath)[0];
-    const archivePath = path.join(extractedJavaPath, archiveName);
-    const version = this.getToolcacheVersionName(javaRelease.version);
-
-    const javaPath = await tc.cacheDir(
-      archivePath,
-      this.toolcacheFolderName,
-      version,
-      this.architecture
-    );
-
-    return {version: javaRelease.version, path: javaPath};
-  }
-
-  private parseVersions(
-    platform: string,
-    arch: string,
-    versions: ISapMachineAllVersions
-  ): ISapMachineVersions[] {
-    const eligibleVersions: ISapMachineVersions[] = [];
-
-    for (const [, majorVersionMap] of Object.entries(versions)) {
-      for (const [, jdkVersionMap] of Object.entries(majorVersionMap.updates)) {
-        for (const [buildVersion, buildVersionMap] of Object.entries(
-          jdkVersionMap
-        )) {
-          let buildVersionWithoutPrefix = buildVersion.replace(
-            'sapmachine-',
-            ''
-          );
-          if (!buildVersionWithoutPrefix.includes('.')) {
-            // replace major version with major.minor.patch and keep the remaining build identifier after the + as is with regex
-            buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(
-              /(\d+)(\+.*)?/,
-              '$1.0.0$2'
-            );
-          }
-          // replace + with . to convert to semver format if we have more than 3 version digits
-          if (buildVersionWithoutPrefix.split('.').length > 3) {
-            buildVersionWithoutPrefix = buildVersionWithoutPrefix.replace(
-              '+',
-              '.'
-            );
-          }
-          buildVersionWithoutPrefix = convertVersionToSemver(
-            buildVersionWithoutPrefix
-          );
-
-          // ignore invalid version
-          if (!semver.valid(buildVersionWithoutPrefix)) {
-            core.debug(`Invalid version: ${buildVersionWithoutPrefix}`);
-            continue;
-          }
-
-          // skip earlyAccessVersions if stable version requested
-          if (this.stable && buildVersionMap.ea === 'true') {
-            continue;
-          }
-
-          for (const [edition, editionAssets] of Object.entries(
-            buildVersionMap.assets
-          )) {
-            if (this.packageType !== edition) {
-              continue;
-            }
-            for (const [archAndPlatForm, archAssets] of Object.entries(
-              editionAssets
-            )) {
-              let expectedArchAndPlatform = `${platform}-${arch}`;
-              if (platform === 'linux-musl') {
-                expectedArchAndPlatform = `linux-${arch}-musl`;
-              }
-              if (archAndPlatForm !== expectedArchAndPlatform) {
-                continue;
-              }
-              for (const [contentType, contentTypeAssets] of Object.entries(
-                archAssets
-              )) {
-                // skip if not tar.gz and zip files
-                if (contentType !== 'tar.gz' && contentType !== 'zip') {
-                  continue;
-                }
-                eligibleVersions.push({
-                  os: platform,
-                  architecture: arch,
-                  version: buildVersionWithoutPrefix,
-                  checksum: contentTypeAssets.checksum,
-                  downloadLink: contentTypeAssets.url,
-                  packageType: edition
-                });
-              }
-            }
-          }
-        }
-      }
-    }
-
-    const sortedVersions = this.sortParsedVersions(eligibleVersions);
-
-    return sortedVersions;
-  }
-
-  // Sorts versions in descending order as by default data in JSON isn't sorted
-  private sortParsedVersions(
-    eligibleVersions: ISapMachineVersions[]
-  ): ISapMachineVersions[] {
-    const sortedVersions = eligibleVersions.sort((versionObj1, versionObj2) => {
-      const version1 = versionObj1.version;
-      const version2 = versionObj2.version;
-      return semver.compareBuild(version1, version2);
-    });
-    return sortedVersions.reverse();
-  }
-
-  private getPlatformOption(): string {
-    switch (process.platform) {
-      case 'win32':
-        return 'windows';
-      case 'darwin':
-        return 'macos';
-      case 'linux':
-        // figure out if alpine/musl
-        if (fs.existsSync('/etc/alpine-release')) {
-          return 'linux-musl';
-        }
-        return 'linux';
-      default:
-        return process.platform;
-    }
-  }
-
-  private async fetchReleasesFromUrl(
-    url: string,
-    headers: OutgoingHttpHeaders = {}
-  ): Promise<ISapMachineAllVersions | null> {
-    try {
-      core.debug(
-        `Trying to fetch available SapMachine versions info from the primary url: ${url}`
-      );
-      const releases = (
-        await this.http.getJson<ISapMachineAllVersions>(url, headers)
-      ).result;
-      return releases;
-    } catch (err) {
-      core.debug(
-        `Fetching SapMachine versions info from the link: ${url} ended up with the error: ${
-          (err as Error).message
-        }`
-      );
-      return null;
-    }
-  }
-}

src/distributions/sapmachine/models.ts

@@ -1,33 +0,0 @@
-export interface ISapMachineAllVersions {
-  [major: string]: {
-    lts: string;
-    updates: {
-      [full_version: string]: {
-        [sapmachineBuild: string]: {
-          release_url: string;
-          ea: string;
-          assets: {
-            [packageType: string]: {
-              [arch: string]: {
-                [content_type: string]: {
-                  name: string;
-                  checksum: string;
-                  url: string;
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
-
-export interface ISapMachineVersions {
-  os: string;
-  architecture: string;
-  version: string;
-  checksum: string;
-  downloadLink: string;
-  packageType: string;
-}

src/distributions/semeru/installer.ts

@@ -33,15 +33,11 @@ export class SemeruDistribution extends JavaBase {
   protected async findPackageForDownload(
     version: string
   ): Promise<JavaDownloadRelease> {
-    const arch = this.distributionArchitecture();
+    if (!supportedArchitectures.includes(this.architecture)) {
-
-    if (!supportedArchitectures.includes(arch)) {
       throw new Error(
         `Unsupported architecture for IBM Semeru: ${
           this.architecture
-        } for your current OS version, the following are supported: ${supportedArchitectures.join(
+        }, the following are supported: ${supportedArchitectures.join(', ')}`
-          ', '
-        )}`
       );
     }
 
@@ -85,7 +81,7 @@ export class SemeruDistribution extends JavaBase {
         ? `\nAvailable versions: ${availableOptions}`
         : '';
       throw new Error(
-        `Could not find satisfied version for SemVer version '${version}' for your current OS version for ${this.architecture} architecture ${availableOptionsMessage}`
+        `Could not find satisfied version for SemVer '${version}'. ${availableOptionsMessage}`
       );
     }
 
@@ -128,7 +124,7 @@ export class SemeruDistribution extends JavaBase {
 
   public async getAvailableVersions(): Promise<ISemeruAvailableVersions[]> {
     const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
+    const arch = this.architecture;
     const imageType = this.packageType;
     const versionRange = encodeURI('[1.0,100.0]'); // retrieve all available versions
     const releaseType = this.stable ? 'ga' : 'ea';