Bump @typescript-eslint/eslint-plugin from 8.35.1 to 8.46.2

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 8.35.1 to 8.46.2.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.46.2/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-version: 8.46.2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/e2e-cache.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -46,7 +46,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
     needs: gradle-save
     steps:
       - name: Checkout
@@ -70,7 +70,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -93,7 +93,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
     needs: maven-save
     steps:
       - name: Checkout
@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-22.04]
+        os: [macos-15-intel, windows-latest, ubuntu-22.04]
     steps:
       - name: Checkout
         uses: actions/checkout@v5
@@ -133,7 +133,7 @@ jobs:
           java-version: '11'
           cache: sbt
       - name: Setup SBT
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
           echo ""Installing SBT...""
           brew install sbt
@@ -141,7 +141,7 @@ jobs:
         run: sbt update
 
       - name: Check files to cache on macos-latest
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
           if [ ! -d ~/Library/Caches/Coursier ]; then
             echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"
@@ -170,7 +170,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-22.04]
+        os: [macos-15-intel, windows-latest, ubuntu-22.04]
     needs: sbt-save
     steps:
       - name: Checkout
@@ -184,7 +184,7 @@ jobs:
           cache: sbt
 
       - name: Confirm that ~/Library/Caches/Coursier directory has been made
-        if: matrix.os == 'macos-13'
+        if: matrix.os == 'macos-15-intel'
         run: |
           if [ ! -d ~/Library/Caches/Coursier ]; then
             echo "::error::The ~/Library/Caches/Coursier directory does not exist unexpectedly"

.github/workflows/e2e-versions.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
         distribution: [
             'temurin',
             'adopt',
@@ -39,10 +39,19 @@ jobs:
           - distribution: microsoft
             version: 8
           - distribution: dragonwell
-            os: macos-13
+            os: macos-15-intel
         include:
+          - distribution: microsoft
+            os: windows-latest
+            version: 25
+          - distribution: microsoft
+            os: ubuntu-latest
+            version: 25
+          - distribution: microsoft
+            os: macos-latest
+            version: 25
           - distribution: oracle
-            os: macos-13
+            os: macos-15-intel
             version: 17
           - distribution: oracle
             os: windows-latest
@@ -220,7 +229,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
         version: ['17-ea', '15.0.0-ea.14']
     steps:
       - name: Checkout
@@ -286,7 +295,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-13, windows-latest, ubuntu-latest]
+        os: [macos-15-intel, windows-latest, ubuntu-latest]
         distribution:
           ['temurin', 'zulu', 'liberica', 'semeru', 'sapmachine', 'jetbrains']
         java-package: ['jre']

__tests__/data/microsoft.json

@@ -1,4 +1,47 @@
 [
+    {
+      "version": "25.0.0",
+      "stable": true,
+      "release_url": "https://aka.ms/download-jdk",
+      "files": [
+        {
+          "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
+          "arch": "x64",
+          "platform": "darwin",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
+          "arch": "x64",
+          "platform": "linux",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
+          "arch": "x64",
+          "platform": "win32",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
+        },
+        {
+          "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
+          "arch": "aarch64",
+          "platform": "darwin",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
+          "arch": "aarch64",
+          "platform": "linux",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
+        },
+        {
+          "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
+          "arch": "aarch64",
+          "platform": "win32",
+          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
+        }
+      ]
+    },
     {
       "version": "21.0.0",
       "stable": true,

__tests__/distributors/microsoft-installer.test.ts

@@ -29,6 +29,11 @@ describe('findPackageForDownload', () => {
   });
 
   it.each([
+    [
+      '25.x',
+      '25.0.0',
+      'https://aka.ms/download-jdk/microsoft-jdk-25.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
+    ],
     [
       '21.x',
       '21.0.0',

dist/cleanup/index.js

@@ -94747,8 +94747,8 @@ function convertVersionToSemver(version) {
 }
 exports.convertVersionToSemver = convertVersionToSemver;
 function getGitHubHttpHeaders() {
-    const token = core.getInput('token');
-    const auth = !token ? undefined : `token ${token}`;
+    const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+    const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
     const headers = {
         accept: 'application/vnd.github.VERSION.raw'
     };

dist/setup/index.js

@@ -129856,6 +129856,7 @@ class JavaBase {
         this.checkLatest = installerOptions.checkLatest;
     }
     setupJava() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let foundJava = this.findInToolcache();
             if (foundJava && !this.checkLatest) {
@@ -129863,40 +129864,106 @@ class JavaBase {
             }
             else {
                 core.info('Trying to resolve the latest version from remote');
-                try {
-                    const javaRelease = yield this.findPackageForDownload(this.version);
-                    core.info(`Resolved latest version as ${javaRelease.version}`);
-                    if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
-                        core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-                    }
-                    else {
-                        core.info('Trying to download...');
-                        foundJava = yield this.downloadTool(javaRelease);
-                        core.info(`Java ${foundJava.version} was downloaded`);
-                    }
-                }
-                catch (error) {
-                    if (error instanceof tc.HTTPError) {
-                        if (error.httpStatusCode === 403) {
-                            core.error('HTTP 403: Permission denied or access restricted.');
+                const MAX_RETRIES = 4;
+                const RETRY_DELAY_MS = 2000;
+                const retryableCodes = [
+                    'ETIMEDOUT',
+                    'ECONNRESET',
+                    'ENOTFOUND',
+                    'ECONNREFUSED'
+                ];
+                let retries = MAX_RETRIES;
+                while (retries > 0) {
+                    try {
+                        // Clear console timers before each attempt to prevent conflicts
+                        if (retries < MAX_RETRIES && core.isDebug()) {
+                            const consoleAny = console;
+                            (_b = (_a = consoleAny._times) === null || _a === void 0 ? void 0 : _a.clear) === null || _b === void 0 ? void 0 : _b.call(_a);
                         }
-                        else if (error.httpStatusCode === 429) {
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+                        const javaRelease = yield this.findPackageForDownload(this.version);
+                        core.info(`Resolved latest version as ${javaRelease.version}`);
+                        if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
+                            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
                         }
                         else {
-                            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
+                            core.info('Trying to download...');
+                            foundJava = yield this.downloadTool(javaRelease);
+                            core.info(`Java ${foundJava.version} was downloaded`);
                         }
+                        break;
                     }
-                    else {
-                        const message = error instanceof Error ? error.message : JSON.stringify(error);
-                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                    catch (error) {
+                        retries--;
+                        // Check if error is retryable (including aggregate errors)
+                        const isRetryable = (error instanceof tc.HTTPError &&
+                            error.httpStatusCode &&
+                            [429, 502, 503, 504].includes(error.httpStatusCode)) ||
+                            retryableCodes.includes(error === null || error === void 0 ? void 0 : error.code) ||
+                            ((error === null || error === void 0 ? void 0 : error.errors) &&
+                                Array.isArray(error.errors) &&
+                                error.errors.some((err) => retryableCodes.includes(err === null || err === void 0 ? void 0 : err.code)));
+                        if (retries > 0 && isRetryable) {
+                            core.debug(`Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`);
+                            yield new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+                            continue;
+                        }
+                        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 if (error && error.errors && Array.isArray(error.errors)) {
+                            core.error(`Java setup failed due to network or configuration error(s)`);
+                            if (error instanceof Error && error.stack) {
+                                core.debug(error.stack);
+                            }
+                            for (const err of error.errors) {
+                                const endpoint = (err === null || err === void 0 ? void 0 : err.address) || (err === null || err === void 0 ? void 0 : err.hostname) || '';
+                                const port = (err === null || err === void 0 ? void 0 : err.port) ? `:${err.port}` : '';
+                                const message = (err === null || err === void 0 ? void 0 : err.message) || 'Aggregate error';
+                                const endpointInfo = !message.includes(endpoint)
+                                    ? ` ${endpoint}${port}`
+                                    : '';
+                                const localInfo = err.localAddress && err.localPort
+                                    ? ` - Local (${err.localAddress}:${err.localPort})`
+                                    : '';
+                                const logMessage = `${message}${endpointInfo}${localInfo}`;
+                                core.error(logMessage);
+                                core.debug(`${err.stack || err.message}`);
+                                Object.entries(err).forEach(([key, value]) => {
+                                    core.debug(`"${key}": ${JSON.stringify(value)}`);
+                                });
+                            }
+                        }
+                        else {
+                            const message = error instanceof Error ? error.message : JSON.stringify(error);
+                            core.error(`Java setup process failed due to: ${message}`);
+                            if (typeof (error === null || error === void 0 ? void 0 : error.code) === 'string') {
+                                core.debug(error.stack);
+                            }
+                            const errorDetails = Object.assign({ name: error.name, message: error.message }, Object.getOwnPropertyNames(error)
+                                .filter(prop => !['name', 'message', 'stack'].includes(prop))
+                                .reduce((acc, prop) => {
+                                acc[prop] = error[prop];
+                                return acc;
+                            }, {}));
+                            Object.entries(errorDetails).forEach(([key, value]) => {
+                                core.debug(`"${key}": ${JSON.stringify(value)}`);
+                            });
+                        }
+                        throw error;
                     }
-                    if (error instanceof Error && error.stack) {
-                        core.debug(error.stack);
-                    }
-                    throw error;
                 }
             }
+            if (!foundJava) {
+                throw new Error('Failed to resolve Java version');
+            }
             // JDK folder may contain postfix "Contents/Home" on macOS
             const macOSPostfixPath = path_1.default.join(foundJava.path, constants_1.MACOS_JAVA_CONTENT_POSTFIX);
             if (process.platform === 'darwin' && fs.existsSync(macOSPostfixPath)) {
@@ -130525,37 +130592,56 @@ const tc = __importStar(__nccwpck_require__(27784));
 const fs_1 = __importDefault(__nccwpck_require__(57147));
 const path_1 = __importDefault(__nccwpck_require__(71017));
 const base_installer_1 = __nccwpck_require__(59741);
-const util_1 = __nccwpck_require__(92629);
 const http_client_1 = __nccwpck_require__(96255);
+const util_1 = __nccwpck_require__(92629);
 const GRAALVM_DL_BASE = 'https://download.oracle.com/graalvm';
 const IS_WINDOWS = process.platform === 'win32';
 const GRAALVM_PLATFORM = IS_WINDOWS ? 'windows' : process.platform;
+const GRAALVM_MIN_VERSION = 17;
+const SUPPORTED_ARCHITECTURES = ['x64', 'aarch64'];
 class GraalVMDistribution extends base_installer_1.JavaBase {
     constructor(installerOptions) {
         super('GraalVM', installerOptions);
     }
     downloadTool(javaRelease) {
         return __awaiter(this, void 0, void 0, function* () {
-            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
-            core.info(`Extracting Java archive...`);
-            const extension = (0, util_1.getDownloadArchiveExtension)();
-            if (process.platform === 'win32') {
-                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            try {
+                core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
+                let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+                core.info(`Extracting Java archive...`);
+                const extension = (0, util_1.getDownloadArchiveExtension)();
+                if (IS_WINDOWS) {
+                    javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+                }
+                const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
+                // Add validation for extracted path
+                if (!fs_1.default.existsSync(extractedJavaPath)) {
+                    throw new Error(`Extraction failed: path ${extractedJavaPath} does not exist`);
+                }
+                const dirContents = fs_1.default.readdirSync(extractedJavaPath);
+                if (dirContents.length === 0) {
+                    throw new Error('Extraction failed: no files found in extracted directory');
+                }
+                const archivePath = path_1.default.join(extractedJavaPath, dirContents[0]);
+                const version = this.getToolcacheVersionName(javaRelease.version);
+                const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
+                return { version: javaRelease.version, path: javaPath };
+            }
+            catch (error) {
+                core.error(`Failed to download and extract GraalVM: ${error}`);
+                throw error;
             }
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
-            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
-            const archivePath = path_1.default.join(extractedJavaPath, archiveName);
-            const version = this.getToolcacheVersionName(javaRelease.version);
-            const javaPath = yield tc.cacheDir(archivePath, this.toolcacheFolderName, version, this.architecture);
-            return { version: javaRelease.version, path: javaPath };
         });
     }
     findPackageForDownload(range) {
         return __awaiter(this, void 0, void 0, function* () {
+            // Add input validation
+            if (!range || typeof range !== 'string') {
+                throw new Error('Version range is required and must be a string');
+            }
             const arch = this.distributionArchitecture();
-            if (arch !== 'x64' && arch !== 'aarch64') {
-                throw new Error(`Unsupported architecture: ${this.architecture}`);
+            if (!SUPPORTED_ARCHITECTURES.includes(arch)) {
+                throw new Error(`Unsupported architecture: ${this.architecture}. Supported architectures are: ${SUPPORTED_ARCHITECTURES.join(', ')}`);
             }
             if (!this.stable) {
                 return this.findEABuildDownloadUrl(`${range}-ea`);
@@ -130565,81 +130651,104 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
             }
             const platform = this.getPlatform();
             const extension = (0, util_1.getDownloadArchiveExtension)();
-            let major;
-            let fileUrl;
-            if (range.includes('.')) {
-                major = range.split('.')[0];
-                fileUrl = `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+            const major = range.includes('.') ? range.split('.')[0] : range;
+            const majorVersion = parseInt(major);
+            if (isNaN(majorVersion)) {
+                throw new Error(`Invalid version format: ${range}`);
             }
-            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');
+            if (majorVersion < GRAALVM_MIN_VERSION) {
+                throw new Error(`GraalVM is only supported for JDK ${GRAALVM_MIN_VERSION} and later. Requested version: ${major}`);
             }
+            const fileUrl = this.constructFileUrl(range, major, platform, arch, extension);
             const response = yield this.http.head(fileUrl);
-            if (response.message.statusCode === http_client_1.HttpCodes.NotFound) {
-                throw new Error(`Could not find GraalVM for SemVer ${range}`);
-            }
-            if (response.message.statusCode !== http_client_1.HttpCodes.OK) {
-                throw new Error(`Http request for GraalVM failed with status code: ${response.message.statusCode}`);
-            }
+            this.handleHttpResponse(response, range);
             return { url: fileUrl, version: range };
         });
     }
+    constructFileUrl(range, major, platform, arch, extension) {
+        return range.includes('.')
+            ? `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`
+            : `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+    }
+    handleHttpResponse(response, range) {
+        const statusCode = response.message.statusCode;
+        if (statusCode === http_client_1.HttpCodes.NotFound) {
+            throw new Error(`Could not find GraalVM for SemVer ${range}. Please check if this version is available at ${GRAALVM_DL_BASE}`);
+        }
+        if (statusCode === http_client_1.HttpCodes.Unauthorized ||
+            statusCode === http_client_1.HttpCodes.Forbidden) {
+            throw new Error(`Access denied when downloading GraalVM. Status code: ${statusCode}. Please check your credentials or permissions.`);
+        }
+        if (statusCode !== http_client_1.HttpCodes.OK) {
+            throw new Error(`HTTP request for GraalVM failed with status code: ${statusCode} (${response.message.statusMessage || 'Unknown error'})`);
+        }
+    }
     findEABuildDownloadUrl(javaEaVersion) {
         return __awaiter(this, void 0, void 0, function* () {
+            core.debug(`Searching for EA build: ${javaEaVersion}`);
             const versions = yield this.fetchEAJson(javaEaVersion);
+            core.debug(`Found ${versions.length} EA versions`);
             const latestVersion = versions.find(v => v.latest);
             if (!latestVersion) {
+                core.error(`Available versions: ${versions.map(v => v.version).join(', ')}`);
                 throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
             }
+            core.debug(`Latest version found: ${latestVersion.version}`);
             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}'`);
+            if (!file) {
+                core.error(`Available files for architecture ${arch}: ${JSON.stringify(latestVersion.files)}`);
+                throw new Error(`Unable to find file for architecture '${arch}' and platform '${GRAALVM_PLATFORM}'`);
             }
+            if (!file.filename.startsWith('graalvm-jdk-')) {
+                throw new Error(`Invalid filename format: ${file.filename}. Expected to start with 'graalvm-jdk-'`);
+            }
+            const downloadUrl = `${latestVersion.download_base_url}${file.filename}`;
+            core.debug(`Download URL: ${downloadUrl}`);
             return {
-                url: `${latestVersion.download_base_url}${file.filename}`,
+                url: downloadUrl,
                 version: latestVersion.version
             };
         });
     }
     fetchEAJson(javaEaVersion) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const owner = 'graalvm';
-            const repository = 'oracle-graalvm-ea-builds';
-            const branch = 'main';
-            const filePath = `versions/${javaEaVersion}.json`;
-            const url = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
+            const url = `https://api.github.com/repos/graalvm/oracle-graalvm-ea-builds/contents/versions/${javaEaVersion}.json?ref=main`;
             const headers = (0, util_1.getGitHubHttpHeaders)();
             core.debug(`Trying to fetch available version info for GraalVM EA builds from '${url}'`);
-            let fetchedJson;
             try {
-                fetchedJson = (yield this.http.getJson(url, headers))
-                    .result;
+                const response = yield this.http.getJson(url, headers);
+                if (!response.result) {
+                    throw new Error(`No GraalVM EA build found for version '${javaEaVersion}'. Please check if the version is correct.`);
+                }
+                return response.result;
             }
-            catch (err) {
-                throw Error(`Fetching version info for GraalVM EA builds from '${url}' failed with the error: ${err.message}`);
+            catch (error) {
+                if (error instanceof Error) {
+                    // Check if it's a 404 error (file not found)
+                    if ((_a = error.message) === null || _a === void 0 ? void 0 : _a.includes('404')) {
+                        throw new Error(`GraalVM EA version '${javaEaVersion}' not found. Please verify the version exists in the EA builds repository.`);
+                    }
+                    // Re-throw with more context
+                    throw new Error(`Failed to fetch GraalVM EA version information for '${javaEaVersion}': ${error.message}`);
+                }
+                // If it's not an Error instance, throw a generic error
+                throw new Error(`Failed to fetch GraalVM EA version information for '${javaEaVersion}'`);
             }
-            if (fetchedJson === null) {
-                throw Error(`No GraalVM EA build found. Are you sure java-version: '${javaEaVersion}' is correct?`);
-            }
-            return fetchedJson;
         });
     }
     getPlatform(platform = process.platform) {
-        switch (platform) {
-            case 'darwin':
-                return 'macos';
-            case 'win32':
-                return 'windows';
-            case 'linux':
-                return 'linux';
-            default:
-                throw new Error(`Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`);
+        const platformMap = {
+            darwin: 'macos',
+            win32: 'windows',
+            linux: 'linux'
+        };
+        const result = platformMap[platform];
+        if (!result) {
+            throw new Error(`Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`);
         }
+        return result;
     }
 }
 exports.GraalVMDistribution = GraalVMDistribution;
@@ -131520,9 +131629,9 @@ class SapMachineDistribution extends base_installer_1.JavaBase {
         return __awaiter(this, void 0, void 0, function* () {
             const platform = this.getPlatformOption();
             const arch = this.distributionArchitecture();
-            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
+            let fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sapmachine.io/assets/data/sapmachine-releases-all.json');
             if (!fetchedReleasesJson) {
-                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://api.github.com/repos/SAP/SapMachine/contents/assets/data/sapmachine-releases-all.json?ref=gh-pages', (0, util_1.getGitHubHttpHeaders)());
+                fetchedReleasesJson = yield this.fetchReleasesFromUrl('https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json');
             }
             if (!fetchedReleasesJson) {
                 throw new Error(`Couldn't fetch SapMachine versions information from both primary and backup urls`);
@@ -132782,8 +132891,8 @@ function convertVersionToSemver(version) {
 }
 exports.convertVersionToSemver = convertVersionToSemver;
 function getGitHubHttpHeaders() {
-    const token = core.getInput('token');
-    const auth = !token ? undefined : `token ${token}`;
+    const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+    const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
     const headers = {
         accept: 'application/vnd.github.VERSION.raw'
     };

package-lock.json

@@ -1,4 +1,3 @@
-
 {
   "name": "setup-java",
   "version": "5.0.0",
@@ -24,7 +23,7 @@
         "@types/jest": "^29.5.14",
         "@types/node": "^24.1.0",
         "@types/semver": "^7.5.8",
-        "@typescript-eslint/eslint-plugin": "^8.35.1",
+        "@typescript-eslint/eslint-plugin": "^8.47.0",
         "@typescript-eslint/parser": "^8.35.1",
         "@vercel/ncc": "^0.38.1",
         "eslint": "^8.57.0",
@@ -841,9 +840,9 @@
       "dev": true
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dev": true,
       "dependencies": {
         "eslint-visitor-keys": "^3.4.3"
@@ -1716,17 +1715,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.35.1.tgz",
-      "integrity": "sha512-9XNTlo7P7RJxbVeICaIIIEipqxLKguyh+3UbXuT2XQuFp6d8VOeDEGuz5IiX0dgZo8CiI6aOFLg4e8cF71SFVg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.47.0.tgz",
+      "integrity": "sha512-fe0rz9WJQ5t2iaLfdbDc9T80GJy0AeO453q8C3YCilnGozvOyCG5t+EZtg7j7D88+c3FipfP/x+wzGnh1xp8ZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/type-utils": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.47.0",
+        "@typescript-eslint/type-utils": "8.47.0",
+        "@typescript-eslint/utils": "8.47.0",
+        "@typescript-eslint/visitor-keys": "8.47.0",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -1740,9 +1739,9 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.35.1",
+        "@typescript-eslint/parser": "^8.47.0",
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": {
@@ -1750,22 +1749,21 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
       "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.35.1.tgz",
-      "integrity": "sha512-3MyiDfrfLeK06bi/g9DqJxP5pV74LNv4rFTyvGDmT3x2p1yp1lOd+qYZfiRPIOf/oON+WRZR5wxxuF85qOar+w==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.47.0.tgz",
+      "integrity": "sha512-lJi3PfxVmo0AkEY93ecfN+r8SofEqZNGByvHAI3GBLrvt1Cw6H5k1IM02nSzu0RfUafr2EvFSw0wAsZgubNplQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/scope-manager": "8.47.0",
+        "@typescript-eslint/types": "8.47.0",
+        "@typescript-eslint/typescript-estree": "8.47.0",
+        "@typescript-eslint/visitor-keys": "8.47.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1777,18 +1775,18 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.35.1.tgz",
-      "integrity": "sha512-VYxn/5LOpVxADAuP3NrnxxHYfzVtQzLKeldIhDhzC8UHaiQvYlXvKuVho1qLduFbJjjy5U5bkGwa3rUGUb1Q6Q==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.47.0.tgz",
+      "integrity": "sha512-2X4BX8hUeB5JcA1TQJ7GjcgulXQ+5UkNb0DL8gHsHUHdFoiCTJoYLTpib3LtSDPZsRET5ygN4qqIWrHyYIKERA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.35.1",
-        "@typescript-eslint/types": "^8.35.1",
+        "@typescript-eslint/tsconfig-utils": "^8.47.0",
+        "@typescript-eslint/types": "^8.47.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1799,18 +1797,18 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.35.1.tgz",
-      "integrity": "sha512-s/Bpd4i7ht2934nG+UoSPlYXd08KYz3bmjLEb7Ye1UVob0d1ENiT3lY8bsCmik4RqfSbPw9xJJHbugpPpP5JUg==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.47.0.tgz",
+      "integrity": "sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1"
+        "@typescript-eslint/types": "8.47.0",
+        "@typescript-eslint/visitor-keys": "8.47.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1821,9 +1819,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.35.1.tgz",
-      "integrity": "sha512-K5/U9VmT9dTHoNowWZpz+/TObS3xqC5h0xAIjXPw+MNcKV9qg6eSatEnmeAwkjHijhACH0/N7bkhKvbt1+DXWQ==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.47.0.tgz",
+      "integrity": "sha512-ybUAvjy4ZCL11uryalkKxuT3w3sXJAuWhOoGS3T/Wu+iUu1tGJmk5ytSY8gbdACNARmcYEB0COksD2j6hfGK2g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1834,18 +1832,19 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.35.1.tgz",
-      "integrity": "sha512-HOrUBlfVRz5W2LIKpXzZoy6VTZzMu2n8q9C2V/cFngIC5U1nStJgv0tMV4sZPzdf4wQm9/ToWUFPMN9Vq9VJQQ==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.47.0.tgz",
+      "integrity": "sha512-QC9RiCmZ2HmIdCEvhd1aJELBlD93ErziOXXlHEZyuBo3tBiAZieya0HLIxp+DoDWlsQqDawyKuNEhORyku+P8A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.35.1",
-        "@typescript-eslint/utils": "8.35.1",
+        "@typescript-eslint/types": "8.47.0",
+        "@typescript-eslint/typescript-estree": "8.47.0",
+        "@typescript-eslint/utils": "8.47.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -1858,13 +1857,13 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.35.1.tgz",
-      "integrity": "sha512-q/O04vVnKHfrrhNAscndAn1tuQhIkwqnaW+eu5waD5IPts2eX1dgJxgqcPx5BX109/qAz7IG6VrEPTOYKCNfRQ==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.47.0.tgz",
+      "integrity": "sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1876,16 +1875,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.35.1.tgz",
-      "integrity": "sha512-Vvpuvj4tBxIka7cPs6Y1uvM7gJgdF5Uu9F+mBJBPY4MhvjrjWGK4H0lVgLJd/8PWZ23FTqsaJaLEkBCFUk8Y9g==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.47.0.tgz",
+      "integrity": "sha512-k6ti9UepJf5NpzCjH31hQNLHQWupTRPhZ+KFF8WtTuTpy7uHPfeg2NM7cP27aCGajoEplxJDFVCEm9TGPYyiVg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.35.1",
-        "@typescript-eslint/tsconfig-utils": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/visitor-keys": "8.35.1",
+        "@typescript-eslint/project-service": "8.47.0",
+        "@typescript-eslint/tsconfig-utils": "8.47.0",
+        "@typescript-eslint/types": "8.47.0",
+        "@typescript-eslint/visitor-keys": "8.47.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -1901,7 +1900,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
@@ -1931,16 +1930,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.35.1.tgz",
-      "integrity": "sha512-lhnwatFmOFcazAsUm3ZnZFpXSxiwoa1Lj50HphnDe1Et01NF4+hrdXONSUHIcbVu2eFb1bAf+5yjXkGVkXBKAQ==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.47.0.tgz",
+      "integrity": "sha512-g7XrNf25iL4TJOiPqatNuaChyqt49a/onq5YsJ9+hXeugK+41LVg7AxikMfM02PC6jbNtZLCJj6AUcQXJS/jGQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.35.1",
-        "@typescript-eslint/types": "8.35.1",
-        "@typescript-eslint/typescript-estree": "8.35.1"
+        "@typescript-eslint/scope-manager": "8.47.0",
+        "@typescript-eslint/types": "8.47.0",
+        "@typescript-eslint/typescript-estree": "8.47.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1951,17 +1950,17 @@
       },
       "peerDependencies": {
         "eslint": "^8.57.0 || ^9.0.0",
-        "typescript": ">=4.8.4 <5.9.0"
+        "typescript": ">=4.8.4 <6.0.0"
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.35.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.35.1.tgz",
-      "integrity": "sha512-VRwixir4zBWCSTP/ljEo091lbpypz57PoeAQ9imjG+vbeof9LplljsL1mos4ccG6H9IjfrVGM359RozUnuFhpw==",
+      "version": "8.47.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.47.0.tgz",
+      "integrity": "sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.35.1",
+        "@typescript-eslint/types": "8.47.0",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -5507,7 +5506,6 @@
       "version": "5.29.0",
       "resolved": "https://registry.npmjs.org/undici/-/undici-5.29.0.tgz",
       "integrity": "sha512-raqeBD6NQK4SkWhQzeYKd1KmIG6dllBOTt55Rmkt4HtI9mwdWtJljnrXjAFUBLTSN67HWrOIZ3EPF4kjUw80Bg==",
-      "license": "MIT",
       "dependencies": {
         "@fastify/busboy": "^2.0.0"
       },

package.json

@@ -43,7 +43,7 @@
     "@types/jest": "^29.5.14",
     "@types/node": "^24.1.0",
     "@types/semver": "^7.5.8",
-    "@typescript-eslint/eslint-plugin": "^8.35.1",
+    "@typescript-eslint/eslint-plugin": "^8.47.0",
     "@typescript-eslint/parser": "^8.35.1",
     "@vercel/ncc": "^0.38.1",
     "eslint": "^8.57.0",

src/distributions/base-installer.ts

@@ -51,39 +51,115 @@ 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);
-        core.info(`Resolved latest version as ${javaRelease.version}`);
-        if (foundJava?.version === javaRelease.version) {
-          core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-        } else {
-          core.info('Trying to download...');
-          foundJava = await this.downloadTool(javaRelease);
-          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}`);
+      const MAX_RETRIES = 4;
+      const RETRY_DELAY_MS = 2000;
+      const retryableCodes = [
+        'ETIMEDOUT',
+        'ECONNRESET',
+        'ENOTFOUND',
+        'ECONNREFUSED'
+      ];
+      let retries = MAX_RETRIES;
+      while (retries > 0) {
+        try {
+          // Clear console timers before each attempt to prevent conflicts
+          if (retries < MAX_RETRIES && core.isDebug()) {
+            const consoleAny = console as any;
+            consoleAny._times?.clear?.();
           }
-        } else {
-          const message =
-            error instanceof Error ? error.message : JSON.stringify(error);
-          core.error(
-            `Java setup failed due to network issue or timeout: ${message}`
-          );
+          const javaRelease = await this.findPackageForDownload(this.version);
+          core.info(`Resolved latest version as ${javaRelease.version}`);
+          if (foundJava?.version === javaRelease.version) {
+            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+          } else {
+            core.info('Trying to download...');
+            foundJava = await this.downloadTool(javaRelease);
+            core.info(`Java ${foundJava.version} was downloaded`);
+          }
+          break;
+        } catch (error: any) {
+          retries--;
+          // Check if error is retryable (including aggregate errors)
+          const isRetryable =
+            (error instanceof tc.HTTPError &&
+              error.httpStatusCode &&
+              [429, 502, 503, 504].includes(error.httpStatusCode)) ||
+            retryableCodes.includes(error?.code) ||
+            (error?.errors &&
+              Array.isArray(error.errors) &&
+              error.errors.some((err: any) =>
+                retryableCodes.includes(err?.code)
+              ));
+          if (retries > 0 && isRetryable) {
+            core.debug(
+              `Attempt failed due to network or timeout issues, initiating retry... (${retries} attempts left)`
+            );
+            await new Promise(r => setTimeout(r, RETRY_DELAY_MS));
+            continue;
+          }
+          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 if (error && error.errors && Array.isArray(error.errors)) {
+            core.error(
+              `Java setup failed due to network or configuration error(s)`
+            );
+            if (error instanceof Error && error.stack) {
+              core.debug(error.stack);
+            }
+            for (const err of error.errors) {
+              const endpoint = err?.address || err?.hostname || '';
+              const port = err?.port ? `:${err.port}` : '';
+              const message = err?.message || 'Aggregate error';
+              const endpointInfo = !message.includes(endpoint)
+                ? ` ${endpoint}${port}`
+                : '';
+              const localInfo =
+                err.localAddress && err.localPort
+                  ? ` - Local (${err.localAddress}:${err.localPort})`
+                  : '';
+              const logMessage = `${message}${endpointInfo}${localInfo}`;
+              core.error(logMessage);
+              core.debug(`${err.stack || err.message}`);
+              Object.entries(err).forEach(([key, value]) => {
+                core.debug(`"${key}": ${JSON.stringify(value)}`);
+              });
+            }
+          } else {
+            const message =
+              error instanceof Error ? error.message : JSON.stringify(error);
+            core.error(`Java setup process failed due to: ${message}`);
+            if (typeof error?.code === 'string') {
+              core.debug(error.stack);
+            }
+            const errorDetails = {
+              name: error.name,
+              message: error.message,
+              ...Object.getOwnPropertyNames(error)
+                .filter(prop => !['name', 'message', 'stack'].includes(prop))
+                .reduce<{[key: string]: any}>((acc, prop) => {
+                  acc[prop] = error[prop];
+                  return acc;
+                }, {})
+            };
+            Object.entries(errorDetails).forEach(([key, value]) => {
+              core.debug(`"${key}": ${JSON.stringify(value)}`);
+            });
+          }
+          throw error;
         }
-        if (error instanceof Error && error.stack) {
-          core.debug(error.stack);
-        }
-        throw error;
       }
     }
-
+    if (!foundJava) {
+      throw new Error('Failed to resolve Java version');
+    }
     // JDK folder may contain postfix "Contents/Home" on macOS
     const macOSPostfixPath = path.join(
       foundJava.path,

src/distributions/graalvm/installer.ts

@@ -1,10 +1,10 @@
 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 {HttpCodes} from '@actions/http-client';
+import {GraalVMEAVersion} from './models';
 import {
   JavaDownloadRelease,
   JavaInstallerOptions,
@@ -16,12 +16,14 @@ import {
   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;
+const GRAALVM_MIN_VERSION = 17;
+const SUPPORTED_ARCHITECTURES = ['x64', 'aarch64'] as const;
+type SupportedArchitecture = (typeof SUPPORTED_ARCHITECTURES)[number];
+type OsVersions = 'linux' | 'macos' | 'windows';
 
 export class GraalVMDistribution extends JavaBase {
   constructor(installerOptions: JavaInstallerOptions) {
@@ -31,38 +33,67 @@ export class GraalVMDistribution extends JavaBase {
   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);
+    try {
+      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);
+      core.info(`Extracting Java archive...`);
+      const extension = getDownloadArchiveExtension();
+      if (IS_WINDOWS) {
+        javaArchivePath = renameWinArchive(javaArchivePath);
+      }
+
+      const extractedJavaPath = await extractJdkFile(
+        javaArchivePath,
+        extension
+      );
+
+      // Add validation for extracted path
+      if (!fs.existsSync(extractedJavaPath)) {
+        throw new Error(
+          `Extraction failed: path ${extractedJavaPath} does not exist`
+        );
+      }
+
+      const dirContents = fs.readdirSync(extractedJavaPath);
+      if (dirContents.length === 0) {
+        throw new Error(
+          'Extraction failed: no files found in extracted directory'
+        );
+      }
+
+      const archivePath = path.join(extractedJavaPath, dirContents[0]);
+      const version = this.getToolcacheVersionName(javaRelease.version);
+
+      const javaPath = await tc.cacheDir(
+        archivePath,
+        this.toolcacheFolderName,
+        version,
+        this.architecture
+      );
+
+      return {version: javaRelease.version, path: javaPath};
+    } catch (error) {
+      core.error(`Failed to download and extract GraalVM: ${error}`);
+      throw error;
     }
-    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> {
+    // Add input validation
+    if (!range || typeof range !== 'string') {
+      throw new Error('Version range is required and must be a string');
+    }
+
     const arch = this.distributionArchitecture();
-    if (arch !== 'x64' && arch !== 'aarch64') {
-      throw new Error(`Unsupported architecture: ${this.architecture}`);
+    if (!SUPPORTED_ARCHITECTURES.includes(arch as SupportedArchitecture)) {
+      throw new Error(
+        `Unsupported architecture: ${this.architecture}. Supported architectures are: ${SUPPORTED_ARCHITECTURES.join(', ')}`
+      );
     }
 
     if (!this.stable) {
@@ -75,52 +106,113 @@ export class GraalVMDistribution extends JavaBase {
 
     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}`;
+    const major = range.includes('.') ? range.split('.')[0] : range;
+    const majorVersion = parseInt(major);
+
+    if (isNaN(majorVersion)) {
+      throw new Error(`Invalid version format: ${range}`);
     }
 
-    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) {
+    if (majorVersion < GRAALVM_MIN_VERSION) {
       throw new Error(
-        `Http request for GraalVM failed with status code: ${response.message.statusCode}`
+        `GraalVM is only supported for JDK ${GRAALVM_MIN_VERSION} and later. Requested version: ${major}`
       );
     }
 
+    const fileUrl = this.constructFileUrl(
+      range,
+      major,
+      platform,
+      arch,
+      extension
+    );
+
+    const response = await this.http.head(fileUrl);
+    this.handleHttpResponse(response, range);
+
     return {url: fileUrl, version: range};
   }
 
+  private constructFileUrl(
+    range: string,
+    major: string,
+    platform: string,
+    arch: string,
+    extension: string
+  ): string {
+    return range.includes('.')
+      ? `${GRAALVM_DL_BASE}/${major}/archive/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`
+      : `${GRAALVM_DL_BASE}/${range}/latest/graalvm-jdk-${range}_${platform}-${arch}_bin.${extension}`;
+  }
+
+  private handleHttpResponse(response: any, range: string): void {
+    const statusCode = response.message.statusCode;
+
+    if (statusCode === HttpCodes.NotFound) {
+      throw new Error(
+        `Could not find GraalVM for SemVer ${range}. Please check if this version is available at ${GRAALVM_DL_BASE}`
+      );
+    }
+
+    if (
+      statusCode === HttpCodes.Unauthorized ||
+      statusCode === HttpCodes.Forbidden
+    ) {
+      throw new Error(
+        `Access denied when downloading GraalVM. Status code: ${statusCode}. Please check your credentials or permissions.`
+      );
+    }
+
+    if (statusCode !== HttpCodes.OK) {
+      throw new Error(
+        `HTTP request for GraalVM failed with status code: ${statusCode} (${response.message.statusMessage || 'Unknown error'})`
+      );
+    }
+  }
+
   private async findEABuildDownloadUrl(
     javaEaVersion: string
   ): Promise<JavaDownloadRelease> {
+    core.debug(`Searching for EA build: ${javaEaVersion}`);
+
     const versions = await this.fetchEAJson(javaEaVersion);
+    core.debug(`Found ${versions.length} EA versions`);
+
     const latestVersion = versions.find(v => v.latest);
     if (!latestVersion) {
+      core.error(
+        `Available versions: ${versions.map(v => v.version).join(', ')}`
+      );
       throw new Error(`Unable to find latest version for '${javaEaVersion}'`);
     }
+
+    core.debug(`Latest version found: ${latestVersion.version}`);
+
     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}'`);
+
+    if (!file) {
+      core.error(
+        `Available files for architecture ${arch}: ${JSON.stringify(latestVersion.files)}`
+      );
+      throw new Error(
+        `Unable to find file for architecture '${arch}' and platform '${GRAALVM_PLATFORM}'`
+      );
     }
+
+    if (!file.filename.startsWith('graalvm-jdk-')) {
+      throw new Error(
+        `Invalid filename format: ${file.filename}. Expected to start with 'graalvm-jdk-'`
+      );
+    }
+
+    const downloadUrl = `${latestVersion.download_base_url}${file.filename}`;
+    core.debug(`Download URL: ${downloadUrl}`);
+
     return {
-      url: `${latestVersion.download_base_url}${file.filename}`,
+      url: downloadUrl,
       version: latestVersion.version
     };
   }
@@ -128,49 +220,59 @@ export class GraalVMDistribution extends JavaBase {
   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 url = `https://api.github.com/repos/graalvm/oracle-graalvm-ea-builds/contents/versions/${javaEaVersion}.json?ref=main`;
     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
-        }`
+      const response = await this.http.getJson<GraalVMEAVersion[]>(
+        url,
+        headers
+      );
+
+      if (!response.result) {
+        throw new Error(
+          `No GraalVM EA build found for version '${javaEaVersion}'. Please check if the version is correct.`
+        );
+      }
+
+      return response.result;
+    } catch (error) {
+      if (error instanceof Error) {
+        // Check if it's a 404 error (file not found)
+        if (error.message?.includes('404')) {
+          throw new Error(
+            `GraalVM EA version '${javaEaVersion}' not found. Please verify the version exists in the EA builds repository.`
+          );
+        }
+        // Re-throw with more context
+        throw new Error(
+          `Failed to fetch GraalVM EA version information for '${javaEaVersion}': ${error.message}`
+        );
+      }
+      // If it's not an Error instance, throw a generic error
+      throw new Error(
+        `Failed to fetch GraalVM EA version information for '${javaEaVersion}'`
       );
     }
-    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'`
-        );
+    const platformMap: Record<string, OsVersions> = {
+      darwin: 'macos',
+      win32: 'windows',
+      linux: 'linux'
+    };
+
+    const result = platformMap[platform];
+    if (!result) {
+      throw new Error(
+        `Platform '${platform}' is not supported. Supported platforms: 'linux', 'macos', 'windows'`
+      );
     }
+    return result;
   }
 }

src/distributions/microsoft/microsoft-openjdk-versions.json

@@ -1,90 +1,133 @@
 [
   {
-  "version": "21.0.2",
-  "stable": true,
-  "release_url": "https://aka.ms/download-jdk",
-  "files": [
-    {
-      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-      "arch": "x64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-      "arch": "x64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-      "arch": "x64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-      "arch": "aarch64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
-    }
-  ]
-},
+    "version": "25.0.0",
+    "stable": true,
+    "release_url": "https://aka.ms/download-jdk",
+    "files": [
+      {
+        "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
+      },
+      {
+        "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
+      }
+    ]
+  },
   {
-  "version": "21.0.1",
-  "stable": true,
-  "release_url": "https://aka.ms/download-jdk",
-  "files": [
-    {
-      "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
-      "arch": "x64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
-      "arch": "x64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
-      "arch": "x64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
-      "arch": "aarch64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
-    }
-  ]
-},
+    "version": "21.0.2",
+    "stable": true,
+    "release_url": "https://aka.ms/download-jdk",
+    "files": [
+      {
+        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
+      }
+    ]
+  },
+  {
+    "version": "21.0.1",
+    "stable": true,
+    "release_url": "https://aka.ms/download-jdk",
+    "files": [
+      {
+        "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
+      }
+    ]
+  },
   {
     "version": "21.0.0",
     "stable": true,
@@ -176,42 +219,42 @@
     "stable": true,
     "release_url": "https://aka.ms/download-jdk",
     "files": [
-    {
-      "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-      "arch": "x64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
-      "arch": "x64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
-      "arch": "x64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
-    },
-    {
-      "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "darwin",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
-      "arch": "aarch64",
-      "platform": "linux",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
-    },
-    {
-      "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
-      "arch": "aarch64",
-      "platform": "win32",
-      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-    }
+      {
+        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
+        "arch": "x64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
+        "arch": "x64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
+        "arch": "x64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
+      },
+      {
+        "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "darwin",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
+        "arch": "aarch64",
+        "platform": "linux",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
+      },
+      {
+        "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
+        "arch": "aarch64",
+        "platform": "win32",
+        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+      }
     ]
   },
   {
@@ -835,4 +878,4 @@
       }
     ]
   }
-]
+]

src/distributions/sapmachine/installer.ts

@@ -8,7 +8,6 @@ import {
   convertVersionToSemver,
   extractJdkFile,
   getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
   isVersionSatisfies,
   renameWinArchive
 } from '../../util';
@@ -64,13 +63,12 @@ export class SapMachineDistribution extends JavaBase {
     const arch = this.distributionArchitecture();
 
     let fetchedReleasesJson = await this.fetchReleasesFromUrl(
-      'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
+      'https://sapmachine.io/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()
+        'https://sap.github.io/SapMachine/assets/data/sapmachine-releases-all.json'
       );
     }
 

src/util.ts

@@ -184,8 +184,8 @@ export function convertVersionToSemver(version: number[] | string) {
 }
 
 export function getGitHubHttpHeaders(): OutgoingHttpHeaders {
-  const token = core.getInput('token');
-  const auth = !token ? undefined : `token ${token}`;
+  const resolvedToken = core.getInput('token') || process.env.GITHUB_TOKEN;
+  const auth = !resolvedToken ? undefined : `token ${resolvedToken}`;
 
   const headers: OutgoingHttpHeaders = {
     accept: 'application/vnd.github.VERSION.raw'