Merge e518b2fd8d into 3b6c050358

.github/workflows/basic-validation.yml

@@ -16,4 +16,4 @@ jobs:
     name: Basic validation
     uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
     with:
-      node-version: '24.x'
+      node-version: '20.x'

.github/workflows/check-dist.yml

@@ -16,4 +16,4 @@ jobs:
     name: Check dist/
     uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
     with:
-      node-version: '24.x'
+      node-version: '20.x'

.github/workflows/e2e-cache-dependency-path.yml

@@ -24,13 +24,13 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '11'
           cache: gradle
           cache-dependency-path: __tests__/cache/gradle1/*.gradle*
       - name: Create files to cache
@@ -51,7 +51,7 @@ jobs:
     needs: gradle1-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -76,7 +76,7 @@ jobs:
     needs: gradle1-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java

.github/workflows/e2e-cache.yml

@@ -24,13 +24,13 @@ jobs:
         os: [macos-13, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
         with:
           distribution: 'adopt'
-          java-version: '17'
+          java-version: '11'
           cache: gradle
       - name: Create files to cache
         # Need to avoid using Gradle daemon to stabilize the save process on Windows
@@ -50,7 +50,7 @@ jobs:
     needs: gradle-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for gradle
         uses: ./
         id: setup-java
@@ -73,7 +73,7 @@ jobs:
         os: [macos-13, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for maven
         uses: ./
         id: setup-java
@@ -97,7 +97,7 @@ jobs:
     needs: maven-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for maven
         uses: ./
         id: setup-java
@@ -124,7 +124,7 @@ jobs:
         os: [macos-13, windows-latest, ubuntu-22.04]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for sbt
         uses: ./
         id: setup-java
@@ -174,7 +174,7 @@ jobs:
     needs: sbt-save
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Run setup-java with the cache for sbt
         uses: ./
         id: setup-java

.github/workflows/e2e-local-file.yml

@@ -21,7 +21,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Download Adopt OpenJDK file
         run: |
           if ($IsLinux) {
@@ -58,7 +58,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Download Zulu OpenJDK file
         run: |
           if ($IsLinux) {
@@ -95,7 +95,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Download Eclipse Temurin file
         run: |
           if ($IsLinux) {

.github/workflows/e2e-publishing.yml

@@ -25,7 +25,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -60,7 +60,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create fake settings.xml
         run: |
           $xmlDirectory = Join-Path $HOME ".m2"
@@ -96,7 +96,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create fake settings.xml
         run: |
           $xmlDirectory = Join-Path $HOME ".m2"
@@ -133,7 +133,7 @@ jobs:
         os: [macos-latest, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java

.github/workflows/e2e-versions.yml

@@ -64,7 +64,7 @@ jobs:
             version: '24-ea'
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -114,7 +114,7 @@ jobs:
             version: '17.0.7'
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -149,7 +149,7 @@ jobs:
             os: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -185,7 +185,7 @@ jobs:
             os: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -224,7 +224,7 @@ jobs:
         version: ['17-ea', '15.0.0-ea.14']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -246,7 +246,7 @@ jobs:
         version: ['17-ea']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -268,7 +268,7 @@ jobs:
         version: ['17-ea', '21-ea']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -355,7 +355,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -383,7 +383,7 @@ jobs:
         version: ['11']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: setup-java
         uses: ./
         id: setup-java
@@ -406,7 +406,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create .java-version file
         shell: bash
         run: echo "17" > .java-version
@@ -435,7 +435,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create .java-version file
         shell: bash
         run: echo "11" > .java-version
@@ -463,7 +463,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create .java-version file
         shell: bash
         run: echo "17.0.10" > .java-version
@@ -491,7 +491,7 @@ jobs:
         java-version-file: ['.java-version', '.tool-versions']
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Create .java-version file
         shell: bash
         run: echo "openjdk64-17.0.10" > .java-version

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

@@ -2,8 +2,7 @@ name: 'Publish Immutable Action Version'
 
 on:
   release:
-    types: [released]
+    types: [published]
-  workflow_dispatch:
 
 jobs:
   publish:
@@ -15,7 +14,7 @@ jobs:
 
     steps:
       - name: Checking out
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
       - name: Publish
         id: publish
         uses: actions/publish-immutable-action@v0.0.4

__tests__/distributors/adopt-installer.test.ts

@@ -191,9 +191,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const installerOptions: JavaInstallerOptions = {
         version: '17',

__tests__/distributors/base-installer.test.ts

@@ -287,7 +287,7 @@ describe('setupJava', () => {
     spyCoreSetOutput = jest.spyOn(core, 'setOutput');
     spyCoreSetOutput.mockImplementation(() => undefined);
 
-    jest.spyOn(os, 'arch').mockReturnValue('x86' as ReturnType<typeof os.arch>);
+    jest.spyOn(os, 'arch').mockReturnValue('x86');
   });
 
   afterEach(() => {

__tests__/distributors/corretto-installer.test.ts

@@ -203,27 +203,28 @@ describe('getAvailableVersions', () => {
     });
 
     it.each([
-      ['amd64', 'x64'],
+      ['arm64', 'aarch64'],
-      ['arm64', 'aarch64']
+      ['amd64', 'x64']
     ])(
       'defaults to os.arch(): %s mapped to distro arch: %s',
       async (osArch: string, distroArch: string) => {
-        jest
+        jest.spyOn(os, 'arch').mockReturnValue(osArch);
-          .spyOn(os, 'arch')
-          .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
-        const distribution = new CorrettoDistribution({
+        const version = '17';
-          version: '17',
+        const installerOptions: JavaInstallerOptions = {
+          version,
           architecture: '', // to get default value
           packageType: 'jdk',
           checkLatest: false
-        });
+        };
+
+        const distribution = new CorrettoDistribution(installerOptions);
         mockPlatform(distribution, 'macos');
 
         const expectedLink = `https://corretto.aws/downloads/resources/17.0.2.8.1/amazon-corretto-17.0.2.8.1-macosx-${distroArch}.tar.gz`;
 
         const availableVersion = await distribution['findPackageForDownload'](
-          '17'
+          version
         );
         expect(availableVersion).not.toBeNull();
         expect(availableVersion.url).toBe(expectedLink);

__tests__/distributors/graalvm-installer.test.ts

@@ -98,35 +98,31 @@ describe('findPackageForDownload', () => {
   });
 
   it.each([
-    ['amd64', ['x64', 'amd64']],
+    ['amd64', 'x64'],
-    ['arm64', ['aarch64', 'arm64']]
+    ['arm64', 'aarch64']
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
-    async (osArch: string, distroArchs: string[]) => {
+    async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
+      jest.spyOn(os, 'platform').mockReturnValue('linux');
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
-      const distribution = new GraalVMDistribution({
+      const version = '21';
-        version: '21',
+      const distro = new GraalVMDistribution({
+        version,
         architecture: '', // to get default value
         packageType: 'jdk',
         checkLatest: false
       });
 
       const osType = distribution.getPlatform();
-      if (osType === 'windows' && distroArchs.includes('aarch64')) {
+      if (osType === 'windows' && distroArch == 'aarch64') {
         return; // skip, aarch64 is not available for Windows
       }
       const archiveType = getDownloadArchiveExtension();
-      const result = await distribution['findPackageForDownload']('21');
+      const result = await distro['findPackageForDownload'](version);
+      const expectedUrl = `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`;
 
-      const expectedUrls = distroArchs.map(
+      expect(result.url).toBe(expectedUrl);
-        distroArch =>
-          `https://download.oracle.com/graalvm/21/latest/graalvm-jdk-21_${osType}-${distroArch}_bin.${archiveType}`
-      );
-
-      expect(expectedUrls).toContain(result.url);
     }
   );
 

__tests__/distributors/jetbrains-installer.test.ts

@@ -41,7 +41,9 @@ describe('getAvailableVersions', () => {
     expect(availableVersions).not.toBeNull();
 
     const length =
-      os.platform() === 'win32' ? manifestData.length : manifestData.length + 2;
+      os.platform() === 'win32'
+        ? manifestData.length - 1
+        : manifestData.length + 1;
     expect(availableVersions.length).toBe(length);
   }, 10_000);
 });

__tests__/distributors/liberica-installer.test.ts

@@ -105,11 +105,9 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
-      const distributions = new LibericaDistributions({
+      const distribution = new LibericaDistributions({
         version: '17',
         architecture: '', // to get default value
         packageType: 'jdk',
@@ -119,11 +117,11 @@ describe('getAvailableVersions', () => {
       const additionalParams =
         '&installation-type=archive&fields=downloadUrl%2Cversion%2CfeatureVersion%2CinterimVersion%2C' +
         'updateVersion%2CbuildVersion';
-      distributions['getPlatformOption'] = () => 'macos';
+      distribution['getPlatformOption'] = () => 'macos';
 
       const buildUrl = `https://api.bell-sw.com/v1/liberica/releases?os=macos&bundle-type=jdk&bitness=${distroArch.bitness}&arch=${distroArch.arch}&build-type=all${additionalParams}`;
 
-      await distributions['getAvailableVersions']();
+      await distribution['getAvailableVersions']();
 
       expect(spyHttpClient.mock.calls).toHaveLength(1);
       expect(spyHttpClient.mock.calls[0][0]).toBe(buildUrl);

__tests__/distributors/liberica-linux-installer.test.ts

@@ -105,9 +105,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const distribution = new LibericaDistributions({
         version: '17',

__tests__/distributors/liberica-windows-installer.test.ts

@@ -105,9 +105,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const distribution = new LibericaDistributions({
         version: '17',

__tests__/distributors/microsoft-installer.test.ts

@@ -95,9 +95,7 @@ describe('findPackageForDownload', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
       jest.spyOn(os, 'platform').mockReturnValue('darwin');
 
       const version = '17';
@@ -121,9 +119,7 @@ describe('findPackageForDownload', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
       jest.spyOn(os, 'platform').mockReturnValue('linux');
 
       const version = '17';
@@ -147,9 +143,7 @@ describe('findPackageForDownload', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
       jest.spyOn(os, 'platform').mockReturnValue('win32');
 
       const version = '17';

__tests__/distributors/oracle-installer.test.ts

@@ -95,9 +95,7 @@ describe('findPackageForDownload', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
       jest.spyOn(os, 'platform').mockReturnValue('linux');
 
       const version = '18';

__tests__/distributors/temurin-installer.test.ts

@@ -147,9 +147,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: string) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(distroArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const installerOptions: JavaInstallerOptions = {
         version: '17',

__tests__/distributors/zulu-installer.test.ts

@@ -1,4 +1,5 @@
 import {HttpClient} from '@actions/http-client';
+import * as semver from 'semver';
 import {ZuluDistribution} from '../../src/distributions/zulu/installer';
 import {IZuluVersions} from '../../src/distributions/zulu/models';
 import * as utils from '../../src/util';
@@ -125,9 +126,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const distribution = new ZuluDistribution({
         version: '17',

__tests__/distributors/zulu-linux-installer.test.ts

@@ -126,9 +126,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const distribution = new ZuluDistribution({
         version: '17',
@@ -137,9 +135,7 @@ describe('getAvailableVersions', () => {
         checkLatest: false
       });
       distribution['getPlatformOption'] = () => 'linux';
-      // Override extension for linux default arch case to match util behavior
+      const buildUrl = `https://api.azul.com/zulu/download/community/v1.0/bundles/?os=linux&ext=zip&bundle_type=jdk&javafx=false&arch=${distroArch.arch}&hw_bitness=${distroArch.bitness}&release_status=ga`;
-      spyUtilGetDownloadArchiveExtension.mockReturnValue('tar.gz');
-      const buildUrl = `https://api.azul.com/zulu/download/community/v1.0/bundles/?os=linux&ext=tar.gz&bundle_type=jdk&javafx=false&arch=${distroArch.arch}&hw_bitness=${distroArch.bitness}&release_status=ga`;
 
       await distribution['getAvailableVersions']();
 

__tests__/distributors/zulu-windows-installer.test.ts

@@ -126,9 +126,7 @@ describe('getAvailableVersions', () => {
   ])(
     'defaults to os.arch(): %s mapped to distro arch: %s',
     async (osArch: string, distroArch: DistroArch) => {
-      jest
+      jest.spyOn(os, 'arch').mockReturnValue(osArch);
-        .spyOn(os, 'arch')
-        .mockReturnValue(osArch as ReturnType<typeof os.arch>);
 
       const distribution = new ZuluDistribution({
         version: '17',

action.yml

@@ -81,6 +81,6 @@ outputs:
   cache-hit:
     description: 'A boolean value to indicate an exact match was found for the primary key'
 runs:
-  using: 'node24'
+  using: 'node20'
   main: 'dist/setup/index.js'
   post: 'dist/cleanup/index.js'

package.json

@@ -1,12 +1,9 @@
 {
   "name": "setup-java",
-  "version": "5.0.0",
+  "version": "4.0.0",
   "private": true,
   "description": "setup java action",
   "main": "dist/setup/index.js",
-   "engines": {
-    "node": ">=24.0.0"
-  },
   "scripts": {
     "build": "ncc build -o dist/setup src/setup-java.ts && ncc build -o dist/cleanup src/cleanup-java.ts",
     "format": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --write \"**/*.{ts,yml,yaml}\"",
@@ -29,10 +26,10 @@
   "author": "GitHub",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^4.0.3",
+    "@actions/cache": "^4.0.2",
     "@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/io": "^1.0.2",
     "@actions/tool-cache": "^2.0.1",
@@ -41,19 +38,19 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.14",
-    "@types/node": "^24.1.0",
+    "@types/node": "^20.11.24",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^8.35.1",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^8.35.1",
+    "@typescript-eslint/parser": "^5.54.0",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^8.6.0",
-    "eslint-plugin-jest": "^29.0.1",
+    "eslint-plugin-jest": "^27.9.0",
     "eslint-plugin-node": "^11.1.0",
     "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/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/jetbrains/installer.ts

@@ -113,18 +113,9 @@ export class JetBrainsDistribution extends JavaBase {
         core.debug(`Gathering available versions from '${rawUrl}'`);
       }
 
-      const paginationPageResult = (
+      const paginationPage = (
         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;
@@ -134,13 +125,9 @@ export class JetBrainsDistribution extends JavaBase {
       page_index++;
     }
 
-    if (this.stable) {
+    // Add versions not available from the API but are downloadable
-      // Add versions not available from the API but are downloadable
+    const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
-      const hidden = ['11_0_10b1145.115', '11_0_11b1341.60'];
+    rawVersions.push(...hidden.map(tag => ({tag_name: tag, name: tag})));
-      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:
@@ -161,7 +148,7 @@ export class JetBrainsDistribution extends JavaBase {
 
       const vsplit = vstring.split('b');
       let semver = vsplit[0];
-      const build = vsplit[1];
+      const build = +vsplit[1];
 
       // Normalize semver
       if (!semver.includes('.') && !semver.includes('_'))

src/distributions/jetbrains/models.ts

@@ -3,12 +3,11 @@
 export interface IJetBrainsRawVersion {
   tag_name: string;
   name: string;
-  prerelease: boolean;
 }
 
 export interface IJetBrainsVersion {
   tag_name: string;
   semver: string;
-  build: string;
+  build: number;
   url: string;
 }

src/distributions/microsoft/installer.ts

@@ -116,7 +116,7 @@ export class MicrosoftDistributions extends JavaBase {
       }
     } catch (err) {
       core.debug(
-        `Http request for microsoft-openjdk-versions.json failed with status code: ${response?.statusCode}. Error: ${err}`
+        `Http request for microsoft-openjdk-versions.json failed with status code: ${response?.statusCode}`
       );
       return null;
     }