Merge 18d114c65a into 6ba5449b7d

* enhance error logging and implement retry

* Replace macos-13 with macos-15-intel

* refactored code based on Copilot suggestions

.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"
@@ -207,3 +207,93 @@ jobs:
             exit 1
           fi
           ls ~/.cache/coursier
+  mill-save:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: __tests__/cache/mill
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13, windows-latest, ubuntu-22.04]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run setup-java with the cache for mill
+        uses: ./
+        id: setup-java
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+          cache: mill
+      - name: Create files to cache
+        run: ./mill --disable-ticker _.compile
+
+      - name: Check files to cache on macos-latest
+        if: matrix.os == 'macos-13'
+        run: |
+          if [ ! -d ~/.cache/mill/download ]; then
+            echo "::error::The ~/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+      - name: Check files to cache on windows-latest
+        if: matrix.os == 'windows-latest'
+        run: |
+          if [ ! -d %USERPROFILE%/.cache/mill/download ]; then
+            echo "::error::The %USERPROFILE%/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+      - name: Check files to cache on ubuntu-latest
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          if [ ! -d ~/.cache/mill/download ]; then
+            echo "::error::The ~/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+  mill-restore:
+    runs-on: ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
+        working-directory: __tests__/cache/mill
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-13, windows-latest, ubuntu-22.04]
+    needs: mill-save
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Run setup-java with the cache for mill
+        uses: ./
+        id: setup-java
+        with:
+          distribution: 'adopt'
+          java-version: '11'
+          cache: mill
+
+      - name: Confirm that ~/.cache/mill/download directory has been made
+        if: matrix.os == 'macos-13'
+        run: |
+          if [ ! -d ~/.cache/mill/download ]; then
+            echo "::error::The ~/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+          ls ~/.cache/mill/download
+      - name: Confirm that %USERPROFILE%/.cache/mill/download directory has been made
+        if: matrix.os == 'windows-latest'
+        run: |
+          if [ ! -d %USERPROFILE%/.cache/mill/download ]; then
+            echo "::error::The %USERPROFILE%/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+          ls %USERPROFILE%/.cache/mill/download
+      - name: Confirm that ~/.cache/mill/download directory has been made
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          if [ ! -d ~/.cache/mill/download ]; then
+            echo "::error::The ~/.cache/mill/download directory does not exist unexpectedly"
+            exit 1
+          fi
+          ls ~/.cache/mill/download

.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']

.gitignore

@@ -1,3 +1,6 @@
+# Ignore Scala IDE files
+.metals/
+
 # Ignore node_modules, ncc is used to compile nodejs modules into a single file
 node_modules/
 __tests__/runner/*

README.md

@@ -14,6 +14,7 @@ The `setup-java` action provides the following functionality for GitHub Actions
 - Caching dependencies managed by Apache Maven.
 - Caching dependencies managed by Gradle.
 - Caching dependencies managed by sbt.
+- Caching dependencies managed by Mill.
 - [Maven Toolchains declaration](https://maven.apache.org/guides/mini/guide-using-toolchains.html) for specified JDK versions.
 
 This action allows you to work with Java and Scala projects.
@@ -48,7 +49,7 @@ For information about the latest releases, recent updates, and newly supported d
 
   - `check-latest`: Setting this option makes the action to check for the latest available version for the version spec.
 
-  - `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predefined package managers. It can be one of "maven", "gradle" or "sbt".
+  - `cache`: Quick [setup caching](#caching-packages-dependencies) for the dependencies managed through one of the predefined package managers. It can be one of "maven", "gradle", "sbt", or "mill".
 
   - `cache-dependency-path`: The path to a dependency file: pom.xml, build.gradle, build.sbt, etc. This option can be used with the `cache` option. If this option is omitted, the action searches for the dependency file in the entire repository. This option supports wildcards and a list of file names for caching multiple dependencies.
 
@@ -130,11 +131,12 @@ Currently, the following distributions are supported:
 **NOTE:** To comply with the GraalVM Free Terms and Conditions (GFTC) license, it is recommended to use GraalVM JDK 17 version 17.0.12, as this is the only version of GraalVM JDK 17 available under the GFTC license. Additionally, it is encouraged to consider upgrading to GraalVM JDK 21, which offers the latest features and improvements.
 
 ### Caching packages dependencies
-The action has a built-in functionality for caching and restoring dependencies. It uses [toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
+The action has a built-in functionality for caching and restoring dependencies. It uses [toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are Gradle, Maven, sbt, and Mill. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files:
 
-- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, `gradle/*.versions.toml`, and `**/versions.properties`
+- Gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, `gradle/*.versions.toml`, and `**/versions.properties`
-- maven: `**/pom.xml`
+- Maven: `**/pom.xml`
 - sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.scala`, `**/project/**.sbt`
+- Mill: `**/build.sc`, `**/*.sc`, `**/mill`, `**/.mill-version`, and `**/.config/mill-version`
 
 When the option `cache-dependency-path` is specified, the hash is based on the matching file. This option supports wildcards and a list of file names, and is especially useful for monorepos.
 
@@ -142,7 +144,7 @@ The workflow output `cache-hit` is set to indicate if an exact match was found f
 
 The cache input is optional, and caching is turned off by default.
 
-#### Caching gradle dependencies
+#### Caching Gradle dependencies
 ```yaml
 steps:
 - uses: actions/checkout@v5
@@ -157,7 +159,7 @@ steps:
 - run: ./gradlew build --no-daemon
 ```
 
-#### Caching maven dependencies
+#### Caching Maven dependencies
 ```yaml
 steps:
 - uses: actions/checkout@v5
@@ -187,6 +189,21 @@ steps:
   run: sbt package
 ```
 
+#### Caching Mill dependencies
+```yaml
+steps:
+- uses: actions/checkout@v4
+- uses: actions/setup-java@v4
+  with:
+    distribution: 'temurin'
+    java-version: '21'
+    cache: 'mill'
+    cache-dependency-path: | # optional
+      sub-project/build.sc
+- name: Build with Mill
+  run: ./mill _.compile
+```
+
 #### Cache segment restore timeout
 Usually, cache gets downloaded in multiple segments of fixed sizes. Sometimes, a segment download gets stuck, which causes the workflow job to be stuck. The cache segment download timeout [was introduced](https://github.com/actions/toolkit/tree/main/packages/cache#cache-segment-restore-timeout) to solve this issue as it allows the segment download to get aborted and hence allows the job to proceed with a cache miss. The default value of the cache segment download timeout is set to 10 minutes and can be customized by specifying an environment variable named `SEGMENT_DOWNLOAD_TIMEOUT_MINS` with a timeout value in minutes.
 

__tests__/cache.test.ts

@@ -201,6 +201,48 @@ describe('dependency cache', () => {
         expect(firstCall).not.toBe(thirdCall);
       });
     });
+    describe('for mill', () => {
+      it('throws error if no build.sc found', async () => {
+        await expect(restore('mill', '')).rejects.toThrow(
+          `No file in ${projectRoot(
+            workspace
+          )} matched to [**/build.sc,**/*.sc,**/mill,**/.mill-version,**/.config/mill-version], make sure you have checked out the target repository`
+        );
+      });
+      it('downloads cache', async () => {
+        createFile(join(workspace, 'build.sc'));
+
+        await restore('mill', '');
+        expect(spyCacheRestore).toHaveBeenCalled();
+        expect(spyGlobHashFiles).toHaveBeenCalledWith(
+          '**/build.sc\n**/*.sc\n**/mill\n**/.mill-version\n**/.config/mill-version'
+        );
+        expect(spyWarning).not.toHaveBeenCalled();
+        expect(spyInfo).toHaveBeenCalledWith('mill cache is not found');
+      });
+      it('detects scala and mill changes under **/mill-build/ folder', async () => {
+        createFile(join(workspace, 'build.sc'));
+        createDirectory(join(workspace, 'project'));
+        createFile(join(workspace, '.config/mill-version'));
+
+        await restore('mill', '');
+        const firstCall = spySaveState.mock.calls.toString();
+
+        spySaveState.mockClear();
+        await restore('mill', '');
+        const secondCall = spySaveState.mock.calls.toString();
+
+        // Make sure multiple restores produce the same cache
+        expect(firstCall).toBe(secondCall);
+
+        spySaveState.mockClear();
+        createFile(join(workspace, '.mill-version'));
+        await restore('mill', '');
+        const thirdCall = spySaveState.mock.calls.toString();
+
+        expect(firstCall).not.toBe(thirdCall);
+      });
+    });
     it('downloads cache based on versions.properties', async () => {
       createFile(join(workspace, 'versions.properties'));
 

__tests__/cache/mill/.gitignore

@@ -0,0 +1 @@
+out/

__tests__/cache/mill/.mill-version

@@ -0,0 +1 @@
+0.12.3

__tests__/cache/mill/build.sc

@@ -0,0 +1,12 @@
+package build
+import mill._, scalalib._
+
+object MyProject extends ScalaModule {
+    def scalaVersion = "2.13.11"
+    def ivyDeps = Agg(ivy"com.lihaoyi::mainargs:0.6.2")
+
+    object test extends ScalaTests {
+        def ivyDeps = Agg(ivy"com.lihaoyi::utest:0.8.5")
+        def testFramework = "utest.runner.Framework"
+    }
+}

__tests__/cache/mill/mill

@@ -0,0 +1,26 @@
+#!/usr/bin/env sh
+# This is a wrapper script that automatically downloads Mill from GitHub.
+set -e
+
+if [ -z "$MILL_VERSION" ] ; then
+    MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
+fi
+
+MILL_DOWNLOAD_PATH="$HOME/.cache/mill/download"
+MILL_EXEC_PATH="${MILL_DOWNLOAD_PATH}/$MILL_VERSION"
+
+if [ ! -x "$MILL_EXEC_PATH" ] ; then
+    mkdir -p "${MILL_DOWNLOAD_PATH}"
+    DOWNLOAD_FILE=$MILL_EXEC_PATH-tmp-download
+    MILL_DOWNLOAD_URL="https://github.com/lihaoyi/mill/releases/download/${MILL_VERSION%%-*}/$MILL_VERSION-assembly"
+    curl --fail -L -o "$DOWNLOAD_FILE" "$MILL_DOWNLOAD_URL"
+    chmod +x "$DOWNLOAD_FILE"
+    mv "$DOWNLOAD_FILE" "$MILL_EXEC_PATH"
+    unset DOWNLOAD_FILE
+    unset MILL_DOWNLOAD_URL
+fi
+
+unset MILL_DOWNLOAD_PATH
+unset MILL_VERSION
+
+exec "${MILL_EXEC_PATH}" "$@"

__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/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 MAX_RETRIES = 4;
-                    const javaRelease = yield this.findPackageForDownload(this.version);
+                const RETRY_DELAY_MS = 2000;
-                    core.info(`Resolved latest version as ${javaRelease.version}`);
+                const retryableCodes = [
-                    if ((foundJava === null || foundJava === void 0 ? void 0 : foundJava.version) === javaRelease.version) {
+                    'ETIMEDOUT',
-                        core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+                    'ECONNRESET',
-                    }
+                    'ENOTFOUND',
-                    else {
+                    'ECONNREFUSED'
-                        core.info('Trying to download...');
+                ];
-                        foundJava = yield this.downloadTool(javaRelease);
+                let retries = MAX_RETRIES;
-                        core.info(`Java ${foundJava.version} was downloaded`);
+                while (retries > 0) {
-                    }
+                    try {
-                }
+                        // Clear console timers before each attempt to prevent conflicts
-                catch (error) {
+                        if (retries < MAX_RETRIES && core.isDebug()) {
-                    if (error instanceof tc.HTTPError) {
+                            const consoleAny = console;
-                        if (error.httpStatusCode === 403) {
+                            (_b = (_a = consoleAny._times) === null || _a === void 0 ? void 0 : _a.clear) === null || _b === void 0 ? void 0 : _b.call(_a);
-                            core.error('HTTP 403: Permission denied or access restricted.');
                         }
-                        else if (error.httpStatusCode === 429) {
+                        const javaRelease = yield this.findPackageForDownload(this.version);
-                            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
+                        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 {
+                    catch (error) {
-                        const message = error instanceof Error ? error.message : JSON.stringify(error);
+                        retries--;
-                        core.error(`Java setup failed due to network issue or timeout: ${message}`);
+                        // 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)) {

package-lock.json

@@ -1,4 +1,3 @@
-
 {
   "name": "setup-java",
   "version": "5.0.0",

src/cache.ts

@@ -13,7 +13,7 @@ const CACHE_MATCHED_KEY = 'cache-matched-key';
 const CACHE_KEY_PREFIX = 'setup-java';
 
 interface PackageManager {
-  id: 'maven' | 'gradle' | 'sbt';
+  id: 'maven' | 'gradle' | 'sbt' | 'mill';
   /**
    * Paths of the file that specify the files to cache.
    */
@@ -60,6 +60,21 @@ const supportedPackageManager: PackageManager[] = [
       '**/project/**.scala',
       '**/project/**.sbt'
     ]
+  },
+  {
+    id: 'mill',
+    path: [
+      join(os.homedir(), '.cache', 'mill')
+    ],
+    pattern: [
+      // https://github.com/coursier/cache-action/blob/4e2615869d13561d626ed48655e1a39e5b192b3c/README.md?plain=1#L28-L38
+      '**/build.sc',
+      '**/*.sc',
+      '**/mill',
+      '**/.mill-version',
+      // https://github.com/com-lihaoyi/mill/blob/5b88d1e268e6264e44589c5ac82c0fdbd680fd63/mill#L6-L11
+      '**/.config/mill-version'
+    ]
   }
 ];
 

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 MAX_RETRIES = 4;
-        const javaRelease = await this.findPackageForDownload(this.version);
+      const RETRY_DELAY_MS = 2000;
-        core.info(`Resolved latest version as ${javaRelease.version}`);
+      const retryableCodes = [
-        if (foundJava?.version === javaRelease.version) {
+        'ETIMEDOUT',
-          core.info(`Resolved Java ${foundJava.version} from tool-cache`);
+        'ECONNRESET',
-        } else {
+        'ENOTFOUND',
-          core.info('Trying to download...');
+        'ECONNREFUSED'
-          foundJava = await this.downloadTool(javaRelease);
+      ];
-          core.info(`Java ${foundJava.version} was downloaded`);
+      let retries = MAX_RETRIES;
-        }
+      while (retries > 0) {
-      } catch (error: any) {
+        try {
-        if (error instanceof tc.HTTPError) {
+          // Clear console timers before each attempt to prevent conflicts
-          if (error.httpStatusCode === 403) {
+          if (retries < MAX_RETRIES && core.isDebug()) {
-            core.error('HTTP 403: Permission denied or access restricted.');
+            const consoleAny = console as any;
-          } else if (error.httpStatusCode === 429) {
+            consoleAny._times?.clear?.();
-            core.warning('HTTP 429: Rate limit exceeded. Please retry later.');
-          } else {
-            core.error(`HTTP ${error.httpStatusCode}: ${error.message}`);
           }
-        } else {
+          const javaRelease = await this.findPackageForDownload(this.version);
-          const message =
+          core.info(`Resolved latest version as ${javaRelease.version}`);
-            error instanceof Error ? error.message : JSON.stringify(error);
+          if (foundJava?.version === javaRelease.version) {
-          core.error(
+            core.info(`Resolved Java ${foundJava.version} from tool-cache`);
-            `Java setup failed due to network issue or timeout: ${message}`
+          } 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/microsoft/microsoft-openjdk-versions.json

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