.github/dependabot.yml

@@ -1,22 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
-
-version: 2
-updates:
-  # Enable version updates for npm
-  - package-ecosystem: 'npm'
-    # Look for `package.json` and `lock` files in the `root` directory
-    directory: '/'
-    # Check the npm registry for updates every day (weekdays)
-    schedule:
-      interval: 'weekly'
-
-  # Enable version updates for GitHub Actions
-  - package-ecosystem: 'github-actions'
-    # Workflow files stored in the default location of `.github/workflows`
-    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
-    directory: '/'
-    schedule:
-      interval: 'weekly'

.github/workflows/e2e-cache.yml

@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-22.04]
+        os: [macos-13, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -170,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-22.04]
+        os: [macos-13, windows-latest, ubuntu-latest]
     needs: sbt-save
     steps:
       - name: Checkout

.github/workflows/e2e-versions.yml

@@ -30,9 +30,7 @@ jobs:
             'microsoft',
             'semeru',
             'corretto',
-            'dragonwell',
+            'dragonwell'
-            'sapmachine',
-            'jetbrains'
           ] # internally 'adopt-hotspot' is the same as 'adopt'
         version: ['21', '11', '17']
         exclude:
@@ -46,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.0.12
-          - 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
@@ -71,8 +58,6 @@ jobs:
         with:
           java-version: ${{ matrix.version }}
           distribution: ${{ matrix.distribution }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
@@ -93,25 +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'
-          - distribution: jetbrains
-            os: ubuntu-latest
-            version: '11.0.11'
-          - distribution: jetbrains
-            os: ubuntu-latest
-            version: '17.0.7'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,8 +97,6 @@ jobs:
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   setup-java-check-latest:
     name: ${{ matrix.distribution }} ${{ matrix.version }} - check-latest flag - ${{ matrix.os }}
@@ -135,15 +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',
-            'jetbrains'
-          ]
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -157,8 +120,6 @@ jobs:
           distribution: ${{ matrix.distribution }}
           java-version: 11
           check-latest: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Verify Java
         run: bash __tests__/verify-java.sh "11" "${{ steps.setup-java.outputs.path }}"
         shell: bash
@@ -171,15 +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',
-            'jetbrains'
-          ]
         exclude:
           - distribution: dragonwell
             os: macos-latest
@@ -194,8 +147,6 @@ jobs:
           java-version: |
             11
             17
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Verify Java env variables
         run: |
           $versionsArr = "11","17"
@@ -257,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
@@ -287,8 +216,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-13, windows-latest, ubuntu-latest]
-        distribution:
+        distribution: ['temurin', 'zulu', 'liberica', 'semeru']
-          ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
         java-package: ['jre']
         version: ['17.0']
         include:
@@ -312,47 +240,6 @@ jobs:
             java-package: jre
             version: '8'
             os: windows-latest
-          - distribution: 'jetbrains'
-            java-package: jdk+jcef
-            version: '11'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jdk+jcef
-            version: '17'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jdk+jcef
-            version: '21'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jre+jcef
-            version: '11'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jre+jcef
-            version: '17'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jre+jcef
-            version: '21'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jdk+ft
-            version: '17'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jdk+ft
-            version: '21'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jre+ft
-            version: '17'
-            os: ubuntu-latest
-          - distribution: 'jetbrains'
-            java-package: jre+ft
-            version: '21'
-            os: ubuntu-latest
-
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -363,8 +250,6 @@ jobs:
           java-version: ${{ matrix.version }}
           java-package: ${{ matrix.java-package }}
           distribution: ${{ matrix.distribution }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Verify Java
         run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
         shell: bash
@@ -378,7 +263,7 @@ jobs:
       fail-fast: false
       matrix:
         # x86 is not supported on macOS
-        os: [windows-latest, ubuntu-22.04]
+        os: [windows-latest, ubuntu-latest]
         distribution: ['liberica', 'zulu', 'corretto']
         version: ['11']
     steps:

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

@@ -1,21 +0,0 @@
-name: 'Publish Immutable Action Version'
-
-on:
-  release:
-    types: [released]
-  workflow_dispatch:
-
-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@v0.0.4

.github/workflows/release-new-action-version.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Update the ${{ env.TAG_NAME }} tag
         id: update-major-tag
-        uses: actions/publish-action@v0.3.0
+        uses: actions/publish-action@v0.2.2
         with:
           source-tag: ${{ env.TAG_NAME }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

README.md

@@ -108,9 +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)
-| `jetbrains` | JetBrains Runtime | [Link](https://github.com/JetBrains/JetBrainsRuntime/) | [Link](https://github.com/JetBrains/JetBrainsRuntime/blob/main/LICENSE)
 
 **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.
 
@@ -118,8 +115,6 @@ Currently, the following distributions are supported:
 
 **NOTE:** For Azul Zulu OpenJDK architectures x64 and arm64 are mapped to x86 / arm with proper hw_bitness.
 
-**NOTE:** To comply with the GraalVM Free Terms and Conditions (GFTC) license, it is recommended to use GraalVM JDK 17 version 17.0.12, as this is the only version of GraalVM JDK 17 available under the GFTC license. Additionally, it is encouraged to consider upgrading to GraalVM JDK 21, which offers the latest features and improvements.
-
 ### Caching packages dependencies
 The action has a built-in functionality for caching and restoring dependencies. It uses [toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
 
@@ -262,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)
@@ -275,15 +268,6 @@ In the example above multiple JDKs are installed for the same job. The result af
 - [Modifying Maven Toolchains](docs/advanced-usage.md#Modifying-Maven-Toolchains)
 - [Java Version File](docs/advanced-usage.md#Java-version-file)
 
-## Recommended permissions
-
-When using the `setup-java` action in your GitHub Actions workflow, it is recommended to set the following permissions to ensure proper functionality:
-
-```yaml
-permissions:
-  contents: read # access to check out code and install dependencies
-```
-
 ## License
 
 The scripts and documentation in this project are released under the [MIT License](LICENSE).

__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/jetbrains-installer.test.ts

@@ -1,118 +0,0 @@
-import https from 'https';
-import {HttpClient} from '@actions/http-client';
-import {JetBrainsDistribution} from '../../src/distributions/jetbrains/installer';
-
-import manifestData from '../data/jetbrains.json';
-import os from 'os';
-
-describe('getAvailableVersions', () => {
-  let spyHttpClient: jest.SpyInstance;
-
-  beforeEach(() => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValue({
-      statusCode: 200,
-      headers: {},
-      result: []
-    });
-  });
-
-  afterEach(() => {
-    jest.resetAllMocks();
-    jest.clearAllMocks();
-    jest.restoreAllMocks();
-  });
-
-  it('load available versions', async () => {
-    spyHttpClient = jest.spyOn(HttpClient.prototype, 'getJson');
-    spyHttpClient.mockReturnValueOnce({
-      statusCode: 200,
-      headers: {},
-      result: manifestData as any
-    });
-
-    const distribution = new JetBrainsDistribution({
-      version: '17',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    const availableVersions = await distribution['getAvailableVersions']();
-    expect(availableVersions).not.toBeNull();
-
-    const length =
-      os.platform() === 'win32' ? manifestData.length : manifestData.length + 2;
-    expect(availableVersions.length).toBe(length);
-  }, 10_000);
-});
-
-describe('findPackageForDownload', () => {
-  it.each([
-    ['17', '17.0.11+1207.24'],
-    ['11.0', '11.0.16+2043.64'],
-    ['11.0.11', '11.0.11+1542.1'],
-    ['21.0.2', '21.0.2+375.1'],
-    ['21', '21.0.3+465.3'],
-    ['x', '21.0.3+465.3']
-  ])('version is resolved correctly %s -> %s', async (input, expected) => {
-    const distribution = new JetBrainsDistribution({
-      version: input,
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData as any;
-    const resolvedVersion = await distribution['findPackageForDownload'](input);
-    expect(resolvedVersion.version).toBe(expected);
-  });
-
-  it.each(['17', '11.0', '11.0.11', '21.0.2', '21'])(
-    'version %s can be downloaded',
-    async input => {
-      const distribution = new JetBrainsDistribution({
-        version: input,
-        architecture: 'x64',
-        packageType: 'jdk',
-        checkLatest: false
-      });
-      distribution['getAvailableVersions'] = async () => manifestData as any;
-      const resolvedVersion = await distribution['findPackageForDownload'](
-        input
-      );
-      const url = resolvedVersion.url;
-      const options = {method: 'HEAD'};
-
-      https.request(url, options, res => {
-        // JetBrains uses 403 for inexistent packages
-        expect(res.statusCode).not.toBe(403);
-        res.resume();
-      });
-    }
-  );
-
-  it('version is not found', async () => {
-    const distribution = new JetBrainsDistribution({
-      version: '8.0.452',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => manifestData as any;
-    await expect(distribution['findPackageForDownload']('8.x')).rejects.toThrow(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-
-  it('version list is empty', async () => {
-    const distribution = new JetBrainsDistribution({
-      version: '8',
-      architecture: 'x64',
-      packageType: 'jdk',
-      checkLatest: false
-    });
-    distribution['getAvailableVersions'] = async () => [];
-    await expect(distribution['findPackageForDownload']('8')).rejects.toThrow(
-      /Could not find satisfied version for SemVer */
-    );
-  });
-});

__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`
       );
     }
   );

__tests__/util.test.ts

@@ -3,8 +3,7 @@ import * as core from '@actions/core';
 import {
   convertVersionToSemver,
   isVersionSatisfies,
-  isCacheFeatureAvailable,
+  isCacheFeatureAvailable
-  isGhes
 } from '../src/util';
 
 jest.mock('@actions/cache');
@@ -81,41 +80,3 @@ describe('convertVersionToSemver', () => {
     expect(actual).toBe(expected);
   });
 });
-
-describe('isGhes', () => {
-  const pristineEnv = process.env;
-
-  beforeEach(() => {
-    jest.resetModules();
-    process.env = {...pristineEnv};
-  });
-
-  afterAll(() => {
-    process.env = pristineEnv;
-  });
-
-  it('returns false when the GITHUB_SERVER_URL environment variable is not defined', async () => {
-    delete process.env['GITHUB_SERVER_URL'];
-    expect(isGhes()).toBeFalsy();
-  });
-
-  it('returns false when the GITHUB_SERVER_URL environment variable is set to github.com', async () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://github.com';
-    expect(isGhes()).toBeFalsy();
-  });
-
-  it('returns false when the GITHUB_SERVER_URL environment variable is set to a GitHub Enterprise Cloud-style URL', async () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://contoso.ghe.com';
-    expect(isGhes()).toBeFalsy();
-  });
-
-  it('returns false when the GITHUB_SERVER_URL environment variable has a .localhost suffix', async () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://mock-github.localhost';
-    expect(isGhes()).toBeFalsy();
-  });
-
-  it('returns true when the GITHUB_SERVER_URL environment variable is set to some other URL', async () => {
-    process.env['GITHUB_SERVER_URL'] = 'https://src.onpremise.fabrikam.com';
-    expect(isGhes()).toBeTruthy();
-  });
-});

docs/advanced-usage.md

@@ -8,9 +8,6 @@
   - [Amazon Corretto](#Amazon-Corretto)
   - [Oracle](#Oracle)
   - [Alibaba Dragonwell](#Alibaba-Dragonwell)
-  - [SapMachine](#SapMachine)
-  - [GraalVM](#GraalVM)
-  - [JetBrains](#JetBrains)
 - [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)
@@ -145,77 +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
-```
-
-### JetBrains
-
-**NOTE:** JetBrains is only available for LTS versions on 11 or later (11, 17, 21, etc.).
-
-Not all minor LTS versions are guarenteed to be available, since JetBrains considers what to ship IntelliJ IDEA with, most commonly on JDK 11.
-For example, `11.0.24` is not available but `11.0.16` is.
-
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'jetbrains'
-    java-version: '11'
-- run: java -cp java HelloWorldApp
-```
-
-The JetBrains installer uses the GitHub API to fetch the latest version. If you believe your project is going to be running into rate limits, you can provide a
-GitHub token to the action to increase the rate limit. Set the `GITHUB_TOKEN` environment variable to the value of your GitHub token in the workflow file.
-
-```yaml
-steps:
-- uses: actions/checkout@v4
-- uses: actions/setup-java@v4
-  with:
-    distribution: 'jetbrains'
-    java-version: '17'
-    java-package: 'jdk' # optional (jdk, jre, jdk+jcef, jre+jcef, jdk+ft, or jre+ft) - defaults to jdk
-  env:
-    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-- run: java -cp java HelloWorldApp
-```
-
-You can specify your package type (as shown in the [releases page](https://github.com/JetBrains/JetBrainsRuntime/releases/)) in the `java-package` parameter. 
-The available package types are:
-
-- `jdk` - JBRSDK
-- `jre` - JBR (Vanilla)
-- `jdk+jcef` - JBRSDK with JCEF
-- `jre+jcef` - JBR with JCEF
-- `jdk+ft` - JBRSDK (FreeType)
-- `jre+ft` - JBR (FreeType)
-
-
 ## Installing custom Java package type
 ```yaml
 steps:
@@ -228,6 +154,7 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
+
 ## Installing custom Java architecture
 
 ```yaml

package-lock.json

@@ -9,18 +9,18 @@
       "version": "4.0.0",
       "license": "MIT",
       "dependencies": {
-        "@actions/cache": "^4.0.3",
+        "@actions/cache": "^3.2.4",
         "@actions/core": "^1.10.0",
         "@actions/exec": "^1.0.4",
-        "@actions/glob": "^0.5.0",
+        "@actions/glob": "^0.4.0",
-        "@actions/http-client": "^2.2.3",
+        "@actions/http-client": "^2.2.1",
         "@actions/io": "^1.0.2",
         "@actions/tool-cache": "^2.0.1",
         "semver": "^7.6.0",
         "xmlbuilder2": "^2.4.0"
       },
       "devDependencies": {
-        "@types/jest": "^29.5.14",
+        "@types/jest": "^29.5.12",
         "@types/node": "^20.11.24",
         "@types/semver": "^7.5.8",
         "@typescript-eslint/eslint-plugin": "^5.54.0",
@@ -33,7 +33,7 @@
         "jest": "^29.7.0",
         "jest-circus": "^29.7.0",
         "prettier": "^2.8.4",
-        "ts-jest": "^29.3.0",
+        "ts-jest": "^29.1.2",
         "typescript": "^5.3.3"
       }
     },
@@ -47,12 +47,11 @@
       }
     },
     "node_modules/@actions/cache": {
-      "version": "4.0.3",
+      "version": "3.2.4",
-      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.2.4.tgz",
-      "integrity": "sha512-SvrqFtYJ7I48A/uXNkoJrnukx5weQv1fGquhs3+4nkByZThBH109KTIqj5x/cGV7JGNvb8dLPVywUOqX1fjiXg==",
+      "integrity": "sha512-RuHnwfcDagtX+37s0ZWy7clbOfnZ7AlDJQ7k/9rzt2W4Gnwde3fa/qjSjVuz4vLcLIpc7fUob27CMrqiWZytYA==",
-      "license": "MIT",
       "dependencies": {
-        "@actions/core": "^1.11.1",
+        "@actions/core": "^1.10.0",
         "@actions/exec": "^1.0.1",
         "@actions/glob": "^0.1.0",
         "@actions/http-client": "^2.1.1",
@@ -60,8 +59,8 @@
         "@azure/abort-controller": "^1.1.0",
         "@azure/ms-rest-js": "^2.6.0",
         "@azure/storage-blob": "^12.13.0",
-        "@protobuf-ts/plugin": "^2.9.4",
+        "semver": "^6.3.1",
-        "semver": "^6.3.1"
+        "uuid": "^3.3.3"
       }
     },
     "node_modules/@actions/cache/node_modules/@actions/glob": {
@@ -82,12 +81,20 @@
       }
     },
     "node_modules/@actions/core": {
-      "version": "1.11.1",
+      "version": "1.10.1",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.11.1.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.10.1.tgz",
-      "integrity": "sha512-hXJCSrkwfA46Vd9Z3q4cpEpHB1rL5NG04+/rbqW9d3+CSvtB1tYe8UTpAlixa1vj0m/ULglfEK2UKxMGxCxv5A==",
+      "integrity": "sha512-3lBR9EDAY+iYIpTnTIXmWcNbX3T2kCkAEQGIQx4NVQ0575nk2k3GRZDTPQG+vVtS2izSLmINlxXf0uLtnrTP+g==",
       "dependencies": {
-        "@actions/exec": "^1.1.1",
+        "@actions/http-client": "^2.0.1",
-        "@actions/http-client": "^2.0.1"
+        "uuid": "^8.3.2"
+      }
+    },
+    "node_modules/@actions/core/node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "bin": {
+        "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/@actions/exec": {
@@ -99,20 +106,18 @@
       }
     },
     "node_modules/@actions/glob": {
-      "version": "0.5.0",
+      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.5.0.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/glob/-/glob-0.4.0.tgz",
-      "integrity": "sha512-tST2rjPvJLRZLuT9NMUtyBjvj9Yo0MiJS3ow004slMvm8GFM+Zv9HvMJ7HWzfUyJnGrJvDsYkWBaaG3YKXRtCw==",
+      "integrity": "sha512-+eKIGFhsFa4EBwaf/GMyzCdWrXWymGXfFmZU3FHQvYS8mPcHtTtZONbkcqqUMzw9mJ/pImEBFET1JNifhqGsAQ==",
-      "license": "MIT",
       "dependencies": {
         "@actions/core": "^1.9.1",
         "minimatch": "^3.0.4"
       }
     },
     "node_modules/@actions/http-client": {
-      "version": "2.2.3",
+      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.3.tgz",
+      "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-2.2.1.tgz",
-      "integrity": "sha512-mx8hyJi/hjFvbPokCg4uRd4ZX78t+YyRPtnKWwIl+RzNaVuFpQHfmlGVfsKEJN8LwTCvL+DfVgAM04XaHkm6bA==",
+      "integrity": "sha512-KhC/cZsq7f8I4LfZSJKgCvEwfkE8o1538VoBeoGzokVLLnbFDEAdFD3UhoMklxo2un9NJVBdANOresx7vTHlHw==",
-      "license": "MIT",
       "dependencies": {
         "tunnel": "^0.0.6",
         "undici": "^5.25.4"
@@ -333,20 +338,89 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.4.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "integrity": "sha512-r1IONyb6Ia+jYR2vvIDhdWdlTGhqbBoFqLTQidzZ4kepUFH15ejXvFHxCVbtl7BOXIudsIubf4E81xeA3h3IXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/highlight": "^7.23.4",
-        "js-tokens": "^4.0.0",
+        "chalk": "^2.4.2"
-        "picocolors": "^1.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/code-frame/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/code-frame/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/code-frame/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/@babel/compat-data": {
       "version": "7.23.3",
       "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.3.tgz",
@@ -534,21 +608,19 @@
       }
     },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
+      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -563,28 +635,109 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.26.10",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.4.tgz",
-      "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
+      "integrity": "sha512-HfcMizYz10cr3h29VqyfGL6ZWIjTwWfvYBMsBVGwpcbhNGe3wQ1ZXZRPzZoAHhd9OqHadHqjQ89iVKINXnbzuw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/template": "^7.26.9",
+        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.26.10"
+        "@babel/traverse": "^7.23.4",
+        "@babel/types": "^7.23.4"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/parser": {
+    "node_modules/@babel/highlight": {
-      "version": "7.26.10",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.10.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==",
+      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.10"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "chalk": "^2.4.2",
+        "js-tokens": "^4.0.0"
       },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
+      "dev": true
+    },
+    "node_modules/@babel/highlight/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/highlight/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.23.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.4.tgz",
+      "integrity": "sha512-vf3Xna6UEprW+7t6EtOmFpHNAuxw3xqPZghy+brsnusscJRW5BMUzzHZc5ICjULee81WeUV2jjakG09MDglJXQ==",
+      "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -770,15 +923,14 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.26.9",
+      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.9.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-qyRplbeIpNZhmzOysF/wFMuP9sctmh2cFzRAZOn1YapxBsE1i9bJIY586R/WBLfLcmcBlM8ROBiQURnnNy+zfA==",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
+        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.26.9",
+        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.26.9"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -815,14 +967,14 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.10",
+      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.4.tgz",
-      "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
+      "integrity": "sha512-7uIFwVYpoplT5jp/kVv6EF93VaJ8H+Yn5IczYiaAi98ajzjfoZfslet/e0sLh+wVBjb2qqIut1b0S26VSafsSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-string-parser": "^7.23.4",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-validator-identifier": "^7.22.20",
+        "to-fast-properties": "^2.0.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1452,83 +1604,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@protobuf-ts/plugin": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin/-/plugin-2.9.5.tgz",
-      "integrity": "sha512-KCzNRTFye837XdfPjS85gGzxgPGVDR3W8Px2G3etXuouNog9W+Cr+U0IBTFADrRWXC2x+OSNjXxrdZEiw+H5Cw==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@protobuf-ts/plugin-framework": "^2.9.5",
-        "@protobuf-ts/protoc": "^2.9.5",
-        "@protobuf-ts/runtime": "^2.9.5",
-        "@protobuf-ts/runtime-rpc": "^2.9.5",
-        "typescript": "^3.9"
-      },
-      "bin": {
-        "protoc-gen-dump": "bin/protoc-gen-dump",
-        "protoc-gen-ts": "bin/protoc-gen-ts"
-      }
-    },
-    "node_modules/@protobuf-ts/plugin-framework": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/plugin-framework/-/plugin-framework-2.9.5.tgz",
-      "integrity": "sha512-DYNQ8Ga3xwPZMfaZGRCnDOcEdQZK9MorTXngVoFLnHWEE8zLhUjFVtdkChZtTih6rl8Z6akyA7hRgj/GrJF58Q==",
-      "license": "(Apache-2.0 AND BSD-3-Clause)",
-      "dependencies": {
-        "@protobuf-ts/runtime": "^2.9.5",
-        "typescript": "^3.9"
-      }
-    },
-    "node_modules/@protobuf-ts/plugin-framework/node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/@protobuf-ts/plugin/node_modules/typescript": {
-      "version": "3.9.10",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
-      "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==",
-      "license": "Apache-2.0",
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/@protobuf-ts/protoc": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/protoc/-/protoc-2.9.5.tgz",
-      "integrity": "sha512-n6a7OHfr/Ubw483L6kNJB0wBCe/Ops0A652zB6J6nR2x1o+pjVFrMCeeQQsqxkYpQwQ8FCIETSxrMpfOBKTIvQ==",
-      "license": "Apache-2.0",
-      "bin": {
-        "protoc": "protoc.js"
-      }
-    },
-    "node_modules/@protobuf-ts/runtime": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime/-/runtime-2.9.5.tgz",
-      "integrity": "sha512-SsumigRe3IqNTCQvVZUqDQExsKF72eyAMiWlYb5Jwj3eU4z8UH7JLlSfb/Wjidz4b/chTN6zh5AXBSKl0Asm3A==",
-      "license": "(Apache-2.0 AND BSD-3-Clause)"
-    },
-    "node_modules/@protobuf-ts/runtime-rpc": {
-      "version": "2.9.5",
-      "resolved": "https://registry.npmjs.org/@protobuf-ts/runtime-rpc/-/runtime-rpc-2.9.5.tgz",
-      "integrity": "sha512-NWAb1TaV4CR+BknZr1WRVT5Ws2AupVwGgRNes4oPAFrgLNXQotDFl2E6pmsjPwME8sAgJVzeSr7bUqQVyoAK2A==",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@protobuf-ts/runtime": "^2.9.5"
-      }
-    },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
       "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
@@ -1628,11 +1703,10 @@
       }
     },
     "node_modules/@types/jest": {
-      "version": "29.5.14",
+      "version": "29.5.12",
-      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.14.tgz",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.12.tgz",
-      "integrity": "sha512-ZN+4sdnLUbo8EVvVc2ao0GFW6oVrQRPn4K2lglySj7APvSrgzxHiNNK99us4WDMi57xxA2yggblIAMNhXOotLQ==",
+      "integrity": "sha512-eDC8bTvT/QhYdxJAulQikueigY5AsdBRH2yDKW3yveW7svY3+DzN84/2NUgkw10RTiJbWqZrTtoGVdYlvFJdLw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "expect": "^29.0.0",
         "pretty-format": "^29.0.0"
@@ -2039,13 +2113,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@@ -2428,11 +2495,10 @@
       }
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.6",
+      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2538,22 +2604,6 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/ejs": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz",
-      "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "jake": "^10.8.5"
-      },
-      "bin": {
-        "ejs": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.589",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.589.tgz",
@@ -3051,39 +3101,6 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/filelist": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
-      "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "minimatch": "^5.0.1"
-      }
-    },
-    "node_modules/filelist/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
-    "node_modules/filelist/node_modules/minimatch": {
-      "version": "5.1.6",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
-      "dev": true,
-      "license": "ISC",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/fill-range": {
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -3556,25 +3573,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
-        "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
-      },
-      "bin": {
-        "jake": "bin/cli.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/jest": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
@@ -4134,8 +4132,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true,
+      "dev": true
-      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -4325,13 +4322,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.8",
+      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -4962,10 +4958,12 @@
       "integrity": "sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA=="
     },
     "node_modules/semver": {
-      "version": "7.7.1",
+      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "license": "ISC",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4973,6 +4971,22 @@
         "node": ">=10"
       }
     },
+    "node_modules/semver/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -5179,6 +5193,15 @@
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
       "dev": true
     },
+    "node_modules/to-fast-properties": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -5192,32 +5215,28 @@
       }
     },
     "node_modules/ts-jest": {
-      "version": "29.3.0",
+      "version": "29.1.2",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.2.tgz",
-      "integrity": "sha512-4bfGBX7Gd1Aqz3SyeDS9O276wEU/BInZxskPrbhZLyv+c1wskDCqDFMJQJLWrIr/fKoAH4GE5dKUlrdyvo+39A==",
+      "integrity": "sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "bs-logger": "^0.2.6",
+        "bs-logger": "0.x",
-        "ejs": "^3.1.10",
+        "fast-json-stable-stringify": "2.x",
-        "fast-json-stable-stringify": "^2.1.0",
         "jest-util": "^29.0.0",
         "json5": "^2.2.3",
-        "lodash.memoize": "^4.1.2",
+        "lodash.memoize": "4.x",
-        "make-error": "^1.3.6",
+        "make-error": "1.x",
-        "semver": "^7.7.1",
+        "semver": "^7.5.3",
-        "type-fest": "^4.37.0",
+        "yargs-parser": "^21.0.1"
-        "yargs-parser": "^21.1.1"
       },
       "bin": {
         "ts-jest": "cli.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0"
+        "node": "^16.10.0 || ^18.0.0 || >=20.0.0"
       },
       "peerDependencies": {
         "@babel/core": ">=7.0.0-beta.0 <8",
-        "@jest/transform": "^29.0.0",
         "@jest/types": "^29.0.0",
         "babel-jest": "^29.0.0",
         "jest": "^29.0.0",
@@ -5227,9 +5246,6 @@
         "@babel/core": {
           "optional": true
         },
-        "@jest/transform": {
-          "optional": true
-        },
         "@jest/types": {
           "optional": true
         },
@@ -5241,19 +5257,6 @@
         }
       }
     },
-    "node_modules/ts-jest/node_modules/type-fest": {
-      "version": "4.38.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.38.0.tgz",
-      "integrity": "sha512-2dBz5D5ycHIoliLYLi0Q2V7KRaDlH0uWIvmk7TYlAg5slqwiPv1ezJdZm1QEM0xgk29oYWMCbIG7E6gHpvChlg==",
-      "dev": true,
-      "license": "(MIT OR CC0-1.0)",
-      "engines": {
-        "node": ">=16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/tslib": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
@@ -5335,10 +5338,9 @@
       }
     },
     "node_modules/undici": {
-      "version": "5.28.5",
+      "version": "5.28.4",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.5.tgz",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-5.28.4.tgz",
-      "integrity": "sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==",
+      "integrity": "sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==",
-      "license": "MIT",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },

package.json

@@ -26,18 +26,18 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^4.0.3",
+    "@actions/cache": "^3.2.4",
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.0.4",
-    "@actions/glob": "^0.5.0",
+    "@actions/glob": "^0.4.0",
-    "@actions/http-client": "^2.2.3",
+    "@actions/http-client": "^2.2.1",
     "@actions/io": "^1.0.2",
     "@actions/tool-cache": "^2.0.1",
     "semver": "^7.6.0",
     "xmlbuilder2": "^2.4.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^29.5.12",
     "@types/node": "^20.11.24",
     "@types/semver": "^7.5.8",
     "@typescript-eslint/eslint-plugin": "^5.54.0",
@@ -50,7 +50,7 @@
     "jest": "^29.7.0",
     "jest-circus": "^29.7.0",
     "prettier": "^2.8.4",
-    "ts-jest": "^29.3.0",
+    "ts-jest": "^29.1.2",
     "typescript": "^5.3.3"
   },
   "bugs": {

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/adopt/installer.ts

@@ -15,8 +15,7 @@ import {
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 
 export enum AdoptImplementation {
@@ -74,13 +73,11 @@ export class AdoptDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];

src/distributions/base-installer.ts

@@ -51,36 +51,14 @@ export abstract class JavaBase {
       core.info(`Resolved Java ${foundJava.version} from tool-cache`);
     } else {
       core.info('Trying to resolve the latest version from remote');
-      try {
+      const javaRelease = await this.findPackageForDownload(this.version);
-        const javaRelease = await this.findPackageForDownload(this.version);
+      core.info(`Resolved latest version as ${javaRelease.version}`);
-        core.info(`Resolved latest version as ${javaRelease.version}`);
+      if (foundJava?.version === javaRelease.version) {
-        if (foundJava?.version === javaRelease.version) {
+        core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-          core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+      } else {
-        } else {
+        core.info('Trying to download...');
-          core.info('Trying to download...');
+        foundJava = await this.downloadTool(javaRelease);
-          foundJava = await this.downloadTool(javaRelease);
+        core.info(`Java ${foundJava.version} was downloaded`);
-          core.info(`Java ${foundJava.version} was downloaded`);
-        }
-      } catch (error: any) {
-        if (error instanceof tc.HTTPError) {
-          if (error.httpStatusCode === 403) {
-            core.error('HTTP 403: Permission denied or access restricted.');
-          } else if (error.httpStatusCode === 429) {
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-          } else {
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
-          }
-        } else {
-          const message =
-            error instanceof Error ? error.message : JSON.stringify(error);
-          core.error(
-            `Java setup failed due to network issue or timeout: ${message}`
-          );
-        }
-        if (error instanceof Error && error.stack) {
-          core.debug(error.stack);
-        }
-        throw error;
       }
     }
 

src/distributions/corretto/installer.ts

@@ -5,8 +5,7 @@ import path from 'path';
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  convertVersionToSemver,
+  convertVersionToSemver
-  renameWinArchive
 } from '../../util';
 import {JavaBase} from '../base-installer';
 import {
@@ -30,14 +29,14 @@ export class CorrettoDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
+
-    if (process.platform === 'win32') {
+    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath = renameWinArchive(javaArchivePath);
+      javaArchivePath,
-    }
+      getDownloadArchiveExtension()
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
+    );
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);
@@ -94,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 =
@@ -117,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,9 +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';
-import {JetBrainsDistribution} from './jetbrains/installer';
 
 enum JavaDistribution {
   Adopt = 'adopt',
@@ -26,10 +23,7 @@ enum JavaDistribution {
   Semeru = 'semeru',
   Corretto = 'corretto',
   Oracle = 'oracle',
-  Dragonwell = 'dragonwell',
+  Dragonwell = 'dragonwell'
-  SapMachine = 'sapmachine',
-  GraalVM = 'graalvm',
-  JetBrains = 'jetbrains'
 }
 
 export function getJavaDistribution(
@@ -70,12 +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);
-    case JavaDistribution.JetBrains:
-      return new JetBrainsDistribution(installerOptions);
     default:
       return null;
   }

src/distributions/dragonwell/installer.ts

@@ -11,8 +11,7 @@ import {
   extractJdkFile,
   getDownloadArchiveExtension,
   getGitHubHttpHeaders,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 import {IDragonwellVersions, IDragonwellAllVersions} from './models';
 import {
@@ -101,14 +100,14 @@ export class DragonwellDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
+
-    if (process.platform === 'win32') {
+    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath = renameWinArchive(javaArchivePath);
+      javaArchivePath,
-    }
+      getDownloadArchiveExtension()
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
+    );
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);

src/distributions/graalvm/installer.ts

@@ -1,176 +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,
-  renameWinArchive
-} 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} ...`
-    );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
-    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/jetbrains/installer.ts

@@ -1,246 +0,0 @@
-import * as core from '@actions/core';
-import * as tc from '@actions/tool-cache';
-
-import fs from 'fs';
-import path from 'path';
-import semver from 'semver';
-
-import {JavaBase} from '../base-installer';
-import {IJetBrainsRawVersion, IJetBrainsVersion} from './models';
-import {
-  JavaDownloadRelease,
-  JavaInstallerOptions,
-  JavaInstallerResults
-} from '../base-models';
-import {extractJdkFile, isVersionSatisfies} from '../../util';
-import {OutgoingHttpHeaders} from 'http';
-import {HttpCodes} from '@actions/http-client';
-
-export class JetBrainsDistribution extends JavaBase {
-  constructor(installerOptions: JavaInstallerOptions) {
-    super('JetBrains', installerOptions);
-  }
-
-  protected async findPackageForDownload(
-    range: string
-  ): Promise<JavaDownloadRelease> {
-    const versionsRaw = await this.getAvailableVersions();
-
-    const versions = versionsRaw.map(v => {
-      const formattedVersion = `${v.semver}+${v.build}`;
-
-      return {
-        version: formattedVersion,
-        url: v.url
-      } as JavaDownloadRelease;
-    });
-
-    const satisfiedVersions = versions
-      .filter(item => isVersionSatisfies(range, item.version))
-      .sort((a, b) => {
-        return -semver.compareBuild(a.version, b.version);
-      });
-
-    const resolvedFullVersion =
-      satisfiedVersions.length > 0 ? satisfiedVersions[0] : null;
-    if (!resolvedFullVersion) {
-      const availableOptions = versionsRaw
-        .map(item => `${item.tag_name} (${item.semver}+${item.build})`)
-        .join(', ');
-      const availableOptionsMessage = availableOptions
-        ? `\nAvailable versions: ${availableOptions}`
-        : '';
-      throw new Error(
-        `Could not find satisfied version for SemVer '${range}'. ${availableOptionsMessage}`
-      );
-    }
-
-    return resolvedFullVersion;
-  }
-
-  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, 'tar.gz');
-
-    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 async getAvailableVersions(): Promise<IJetBrainsVersion[]> {
-    const platform = this.getPlatformOption();
-    const arch = this.distributionArchitecture();
-
-    if (core.isDebug()) {
-      console.time('Retrieving available versions for JBR took'); // eslint-disable-line no-console
-    }
-
-    // need to iterate through all pages to retrieve the list of all versions
-    // GitHub API doesn't provide way to retrieve the count of pages to iterate so infinity loop
-    let page_index = 1;
-    const rawVersions: IJetBrainsRawVersion[] = [];
-    const bearerToken = process.env.GITHUB_TOKEN;
-
-    while (true) {
-      const requestArguments = `per_page=100&page=${page_index}`;
-      const requestHeaders: OutgoingHttpHeaders = {};
-
-      if (bearerToken) {
-        requestHeaders['Authorization'] = `Bearer ${bearerToken}`;
-      }
-
-      const rawUrl = `https://api.github.com/repos/JetBrains/JetBrainsRuntime/releases?${requestArguments}`;
-
-      if (core.isDebug() && page_index === 1) {
-        // url is identical except page_index so print it once for debug
-        core.debug(`Gathering available versions from '${rawUrl}'`);
-      }
-
-      const paginationPageResult = (
-        await this.http.getJson<IJetBrainsRawVersion[]>(rawUrl, requestHeaders)
-      ).result;
-      if (!paginationPageResult || paginationPageResult.length === 0) {
-        // break infinity loop because we have reached end of pagination
-        break;
-      }
-
-      const paginationPage: IJetBrainsRawVersion[] =
-        paginationPageResult.filter(version =>
-          this.stable ? !version.prerelease : version.prerelease
-        );
-      if (!paginationPage || paginationPage.length === 0) {
-        // break infinity loop because we have reached end of pagination
-        break;
-      }
-
-      rawVersions.push(...paginationPage);
-      page_index++;
-    }
-
-    if (this.stable) {
-      // Add versions not available from the API but are downloadable
-      const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-      rawVersions.push(
-        ...hidden.map(tag => ({tag_name: tag, name: tag, prerelease: false}))
-      );
-    }
-
-    const versions0 = rawVersions.map(async v => {
-      // Release tags look like one of these:
-      // jbr-release-21.0.3b465.3
-      // jbr17-b87.7
-      // jb11_0_11-b87.7
-      // jbr11_0_15b2043.56
-      // 11_0_11b1536.2
-      // 11_0_11-b1522
-      const tag = v.tag_name;
-
-      // Extract version string
-      const vstring = tag
-        .replace('jbr-release-', '')
-        .replace('jbr', '')
-        .replace('jb', '')
-        .replace('-', '');
-
-      const vsplit = vstring.split('b');
-      let semver = vsplit[0];
-      const build = vsplit[1];
-
-      // Normalize semver
-      if (!semver.includes('.') && !semver.includes('_'))
-        semver = `${semver}.0.0`;
-
-      // Construct URL
-      let type: string;
-      switch (this.packageType ?? '') {
-        case 'jre':
-          type = 'jbr';
-          break;
-        case 'jdk+jcef':
-          type = 'jbrsdk_jcef';
-          break;
-        case 'jre+jcef':
-          type = 'jbr_jcef';
-          break;
-        case 'jdk+ft':
-          type = 'jbrsdk_ft';
-          break;
-        case 'jre+ft':
-          type = 'jbr_ft';
-          break;
-        default:
-          type = 'jbrsdk';
-          break;
-      }
-
-      let url = `https://cache-redirector.jetbrains.com/intellij-jbr/${type}-${semver}-${platform}-${arch}-b${build}.tar.gz`;
-      let include = false;
-
-      const res = await this.http.head(url);
-      if (res.message.statusCode === HttpCodes.OK) {
-        include = true;
-      } else {
-        url = `https://cache-redirector.jetbrains.com/intellij-jbr/${type}_nomod-${semver}-${platform}-${arch}-b${build}.tar.gz`;
-        const res2 = await this.http.head(url);
-        if (res2.message.statusCode === HttpCodes.OK) {
-          include = true;
-        }
-      }
-
-      const version = {
-        tag_name: tag,
-        semver: semver.replace(/_/g, '.'),
-        build: build,
-        url: url
-      } as IJetBrainsVersion;
-
-      return {
-        item: version,
-        include: include
-      };
-    });
-
-    const versions = await Promise.all(versions0).then(res =>
-      res.filter(item => item.include).map(item => item.item)
-    );
-
-    if (core.isDebug()) {
-      core.startGroup('Print information about available versions');
-      console.timeEnd('Retrieving available versions for JBR took'); // eslint-disable-line no-console
-      core.debug(`Available versions: [${versions.length}]`);
-      core.debug(versions.map(item => item.semver).join(', '));
-      core.endGroup();
-    }
-
-    return versions;
-  }
-
-  private getPlatformOption(): string {
-    // Jetbrains has own platform names so need to map them
-    switch (process.platform) {
-      case 'darwin':
-        return 'osx';
-      case 'win32':
-        return 'windows';
-      default:
-        return process.platform;
-    }
-  }
-}

src/distributions/jetbrains/models.ts

@@ -1,14 +0,0 @@
-// Raw Model from https://api.github.com/repos/JetBrains/JetBrainsRuntime/releases
-
-export interface IJetBrainsRawVersion {
-  tag_name: string;
-  name: string;
-  prerelease: boolean;
-}
-
-export interface IJetBrainsVersion {
-  tag_name: string;
-  semver: string;
-  build: string;
-  url: string;
-}

src/distributions/liberica/installer.ts

@@ -8,8 +8,7 @@ import semver from 'semver';
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 import * as core from '@actions/core';
 import {ArchitectureOptions, LibericaVersion, OsVersions} from './models';
@@ -36,8 +35,13 @@ export class LibericaDistributions extends JavaBase {
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+    if (
-      javaArchivePath = renameWinArchive(javaArchivePath);
+      process.platform === 'win32' &&
+      (this.architecture === 'arm64' || this.architecture === 'aarch64')
+    ) {
+      const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+      await fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+      javaArchivePath = javaArchivePathRenamed;
     }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 

src/distributions/microsoft/installer.ts

@@ -7,8 +7,7 @@ import {
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
+  getGitHubHttpHeaders
-  renameWinArchive
 } from '../../util';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
@@ -28,12 +27,22 @@ export class MicrosoftDistributions extends JavaBase {
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
     let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    // Rename archive to add extension because after downloading
+    // archive does not contain extension type and it leads to some issues
+    // on Windows runners without PowerShell Core.
+    //
+    // For default PowerShell Windows it should contain extension type to unpack it.
+    if (
+      process.platform === 'win32' &&
+      (this.architecture === 'arm64' || this.architecture === 'aarch64')
+    ) {
+      const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+      await fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+      javaArchivePath = javaArchivePathRenamed;
+    }
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];

src/distributions/oracle/installer.ts

@@ -10,11 +10,7 @@ import {
   JavaInstallerOptions,
   JavaInstallerResults
 } from '../base-models';
-import {
+import {extractJdkFile, getDownloadArchiveExtension} from '../../util';
-  extractJdkFile,
-  getDownloadArchiveExtension,
-  renameWinArchive
-} from '../../util';
 import {HttpCodes} from '@actions/http-client';
 
 const ORACLE_DL_BASE = 'https://download.oracle.com/java';
@@ -30,13 +26,11 @@ export class OracleDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];

src/distributions/sapmachine/installer.ts

@@ -1,269 +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,
-  renameWinArchive
-} 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} ...`
-    );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
-
-    core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
-    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};
-  }
-
-  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

@@ -8,8 +8,7 @@ import semver from 'semver';
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
@@ -34,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(', ')}`
-          ', '
-        )}`
       );
     }
 
@@ -86,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}`
       );
     }
 
@@ -99,13 +94,11 @@ export class SemeruDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
     const extractedJavaPath: string = await extractJdkFile(
       javaArchivePath,
       extension
@@ -131,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';

src/distributions/temurin/installer.ts

@@ -15,8 +15,7 @@ import {
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 
 export enum TemurinImplementation {
@@ -77,13 +76,11 @@ export class TemurinDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];

src/distributions/zulu/installer.ts

@@ -11,8 +11,7 @@ import {
   extractJdkFile,
   getDownloadArchiveExtension,
   convertVersionToSemver,
-  isVersionSatisfies,
+  isVersionSatisfies
-  renameWinArchive
 } from '../../util';
 import {
   JavaDownloadRelease,
@@ -81,8 +80,13 @@ export class ZuluDistribution extends JavaBase {
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
+    if (
-      javaArchivePath = renameWinArchive(javaArchivePath);
+      process.platform === 'win32' &&
+      (this.architecture === 'arm64' || this.architecture === 'aarch64')
+    ) {
+      const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+      await fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+      javaArchivePath = javaArchivePathRenamed;
     }
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 

src/util.ts

@@ -92,13 +92,7 @@ export function isGhes(): boolean {
   const ghUrl = new URL(
     process.env['GITHUB_SERVER_URL'] || 'https://github.com'
   );
-
+  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
-  const hostname = ghUrl.hostname.trimEnd().toUpperCase();
-  const isGitHubHost = hostname === 'GITHUB.COM';
-  const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
-  const isLocalHost = hostname.endsWith('.LOCALHOST');
-
-  return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 
 export function isCacheFeatureAvailable(): boolean {
@@ -196,14 +190,3 @@ export function getGitHubHttpHeaders(): OutgoingHttpHeaders {
   }
   return headers;
 }
-
-// Rename archive to add extension because after downloading
-// archive does not contain extension type and it leads to some issues
-// on Windows runners without PowerShell Core.
-//
-// For default PowerShell Windows it should contain extension type to unpack it.
-export function renameWinArchive(javaArchivePath: string): string {
-  const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-  fs.renameSync(javaArchivePath, javaArchivePathRenamed);
-  return javaArchivePathRenamed;
-}