Merge 8bb7cab8d1 into 8df1039502

Refine isGhes logic (#697 )
Update workflows for GraalVM and Version Enhancements (#699 )
2026-07-09 23:05:38 +00:00 · 2024-11-15 08:41:24 -05:00 · 2024-10-21 19:57:52 +02:00 · 2024-10-21 11:43:20 -05:00 · 2024-10-10 16:32:25 -05:00 · 2024-08-23 23:50:09 +02:00
26 changed files with 374 additions and 179 deletions
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -51,7 +51,7 @@ jobs:
            version: 21
          - distribution: graalvm
            os: macos-latest
-            version: 17
+            version: 17.0.12
          - distribution: graalvm
            os: windows-latest
            version: 21
--- a/.github/workflows/release-new-action-version.yml
+++ b/.github/workflows/release-new-action-version.yml
@ -23,7 +23,7 @@ jobs:
    steps:
      - name: Update the ${{ env.TAG_NAME }} tag
        id: update-major-tag
-        uses: actions/publish-action@v0.2.2
+        uses: actions/publish-action@v0.3.0
        with:
          source-tag: ${{ env.TAG_NAME }}
          slack-webhook: ${{ secrets.SLACK_WEBHOOK }}
--- a/README.md
+++ b/README.md
@ -46,7 +46,13 @@ This action allows you to work with Java and Scala projects.
  #### Maven options
  The action has a bunch of inputs to generate maven's [settings.xml](https://maven.apache.org/settings.html) on the fly and pass the values to Apache Maven GPG Plugin as well as Apache Maven Toolchains. See [advanced usage](docs/advanced-usage.md) for more.

-  - `overwrite-settings`: By default action overwrites the settings.xml. In order to skip generation of file if it exists, set this to `false`.
+  - `overwrite-settings`: By default action overwrites the settings.xml and adds a toolchain entry to toolchains.xml. In order to skip generation of settings.xml and skip adding a toolchain entry to toolchains.xml if the according file exists, set this to `false`.
+
+  - `update-env-javahome`: By default action updates `env.JAVA_HOME` with the path of java installed. In order to skip update of JAVA_HOME, set this to `false`. The creation of the env variable JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }} is NOT affected by this item. That will be created for any setup.
+
+  - `update-env-path`: By default action adds `<java_install_dir>/bin` to `env.PATH`. In order to skip this, set this to `false`.
+
+  - `update-toolchains-only`: If set to true, then `overwrite-settings`, `update-env-javahome` and `update-env-path` are propagated to `false` if the specific one is not explicitly configured to `true`. Only a toolchain entry will be added to toolchains.xml. Default is `false`.

  - `server-id`: ID of the distributionManagement repository in the pom.xml file. Default is `github`.

@ -232,7 +238,7 @@ jobs:

 ### Install multiple JDKs

-All versions are added to the PATH. The last version will be used and available globally. Other Java versions can be accessed through env variables with such specification as 'JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }}'.
+By default all versions are added to the PATH. The last version will be used and available globally. Other Java versions can be accessed through env variables with such specification as 'JAVA_HOME_{{ MAJOR_VERSION }}_{{ ARCHITECTURE }}'.

 ```yaml
    steps:
@ -245,6 +251,8 @@ All versions are added to the PATH. The last version will be used and available
            15
 ```

+**NOTE:** An alternative option is to use multiple setup-java steps. In this case the behavior can be controlled more granular by making use of the input items `overwrite-settings`, `update-env-javahome`, `update-env-path` and `update-toolchains-only`.
+
 ### Using Maven Toolchains
 In the example above multiple JDKs are installed for the same job. The result after the last JDK is installed is a Maven Toolchains declaration containing references to all three JDKs. The values for `id`, `version`, and `vendor` of the individual Toolchain entries are the given input values for `distribution` and `java-version` (`vendor` being the combination of `${distribution}_${java-version}`) by default.

--- a/tests/util.test.ts
+++ b/tests/util.test.ts
@ -3,7 +3,8 @@ import * as core from '@actions/core';
 import {
  convertVersionToSemver,
  isVersionSatisfies,
-  isCacheFeatureAvailable
+  isCacheFeatureAvailable,
+  isGhes
 } from '../src/util';

 jest.mock('@actions/cache');
@ -80,3 +81,41 @@ describe('convertVersionToSemver', () => {
    expect(actual).toBe(expected);
  });
 });
+
+describe('isGhes', () => {
+  const pristineEnv = process.env;
+
+  beforeEach(() => {
+    jest.resetModules();
+    process.env = {...pristineEnv};
+  });
+
+  afterAll(() => {
+    process.env = pristineEnv;
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is not defined', async () => {
+    delete process.env['GITHUB_SERVER_URL'];
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to github.com', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://github.com';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to a GitHub Enterprise Cloud-style URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://contoso.ghe.com';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable has a .localhost suffix', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://mock-github.localhost';
+    expect(isGhes()).toBeFalsy();
+  });
+
+  it('returns true when the GITHUB_SERVER_URL environment variable is set to some other URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://src.onpremise.fabrikam.com';
+    expect(isGhes()).toBeTruthy();
+  });
+});
--- a/action.yml
+++ b/action.yml
@ -43,9 +43,21 @@ inputs:
    description: 'Path to where the settings.xml file will be written. Default is ~/.m2.'
    required: false
  overwrite-settings:
-    description: 'Overwrite the settings.xml file if it exists. Default is "true".'
+    description: 'Overwrite the settings.xml file if it exists. Default is "!update-toolchains-only". If explcitly set "true", it will update settings.xml regardless of "update-toolchains-only"'
    required: false
-    default: true
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
+  update-toolchains-only:
+    description: 'Update toolchains.xml only. Default is "false". No update of settings.xml, no update of JAVA_HOME, no adding to PATH by default - unless "overwrite-settings", "update-env-javahome" or "add-to-env-path" are not explicitly set "true"'
+    required: false
+    default: false
+  update-env-javahome:
+    description: 'Update the JAVA_HOME environment variable. Default is "!update-toolchains-only"'
+    required: false
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
+  add-to-env-path:
+    description: 'Add "<JDK home>/bin" to the PATH environment variable. Default is "!update-toolchains-only"'
+    required: false
+    # DO NOT set a default here! The default will be propagated from input 'update-toolchains-only'!
  gpg-private-key:
    description: 'GPG private key to import. Default is empty string.'
    required: false
--- a/dist/cleanup/index.js
+++ b/dist/cleanup/index.js
@ -88311,7 +88311,7 @@ else {
 "use strict";

 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
+exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_ADD_TO_PATH = exports.INPUT_UPDATE_JAVA_HOME = exports.INPUT_UPDATE_TOOLCHAINS_ONLY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
 exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
 exports.INPUT_JAVA_VERSION = 'java-version';
 exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@ -88325,6 +88325,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
 exports.INPUT_SERVER_PASSWORD = 'server-password';
 exports.INPUT_SETTINGS_PATH = 'settings-path';
 exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
+exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
+exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
+exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
 exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
 exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
 exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
@ -88470,7 +88473,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getGitHubHttpHeaders = exports.convertVersionToSemver = exports.getVersionFromFileContent = exports.isCacheFeatureAvailable = exports.isGhes = exports.isJobStatusSuccess = exports.getToolcachePath = exports.isVersionSatisfies = exports.getDownloadArchiveExtension = exports.extractJdkFile = exports.getVersionFromToolcachePath = exports.getBooleanInput = exports.getTempDir = void 0;
+exports.renameWinArchive = exports.getGitHubHttpHeaders = exports.convertVersionToSemver = exports.getVersionFromFileContent = exports.isCacheFeatureAvailable = exports.isGhes = exports.isJobStatusSuccess = exports.getToolcachePath = exports.isVersionSatisfies = exports.getDownloadArchiveExtension = exports.extractJdkFile = exports.getVersionFromToolcachePath = exports.getBooleanInput = exports.getTempDir = void 0;
 const os_1 = __importDefault(__nccwpck_require__(2037));
 const path_1 = __importDefault(__nccwpck_require__(1017));
 const fs = __importStar(__nccwpck_require__(7147));
@ -88552,7 +88555,11 @@ function isJobStatusSuccess() {
 exports.isJobStatusSuccess = isJobStatusSuccess;
 function isGhes() {
    const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+    const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+    const isGitHubHost = hostname === 'GITHUB.COM';
+    const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+    const isLocalHost = hostname.endsWith('.LOCALHOST');
+    return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
@ -88630,6 +88637,17 @@ function getGitHubHttpHeaders() {
    return headers;
 }
 exports.getGitHubHttpHeaders = getGitHubHttpHeaders;
+// Rename archive to add extension because after downloading
+// archive does not contain extension type and it leads to some issues
+// on Windows runners without PowerShell Core.
+//
+// For default PowerShell Windows it should contain extension type to unpack it.
+function renameWinArchive(javaArchivePath) {
+    const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+    fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+    return javaArchivePathRenamed;
+}
+exports.renameWinArchive = renameWinArchive;


 /***/ }),
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@ -123151,15 +123151,13 @@ const os = __importStar(__nccwpck_require__(22037));
 const xmlbuilder2_1 = __nccwpck_require__(70151);
 const constants = __importStar(__nccwpck_require__(69042));
 const gpg = __importStar(__nccwpck_require__(23759));
-const util_1 = __nccwpck_require__(92629);
-function configureAuthentication() {
+function configureAuthentication(overwriteSettings) {
    return __awaiter(this, void 0, void 0, function* () {
        const id = core.getInput(constants.INPUT_SERVER_ID);
        const username = core.getInput(constants.INPUT_SERVER_USERNAME);
        const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
        const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
            path.join(os.homedir(), constants.M2_DIR);
-        const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
        const gpgPrivateKey = core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
            constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
        const gpgPassphrase = core.getInput(constants.INPUT_GPG_PASSPHRASE) ||
@ -123455,7 +123453,7 @@ function isProbablyGradleDaemonProblem(packageManager, error) {
 "use strict";

 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
+exports.DISTRIBUTIONS_ONLY_MAJOR_VERSION = exports.INPUT_MVN_TOOLCHAIN_VENDOR = exports.INPUT_MVN_TOOLCHAIN_ID = exports.MVN_TOOLCHAINS_FILE = exports.MVN_SETTINGS_FILE = exports.M2_DIR = exports.STATE_GPG_PRIVATE_KEY_FINGERPRINT = exports.INPUT_JOB_STATUS = exports.INPUT_CACHE_DEPENDENCY_PATH = exports.INPUT_CACHE = exports.INPUT_DEFAULT_GPG_PASSPHRASE = exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = exports.INPUT_GPG_PASSPHRASE = exports.INPUT_GPG_PRIVATE_KEY = exports.INPUT_ADD_TO_PATH = exports.INPUT_UPDATE_JAVA_HOME = exports.INPUT_UPDATE_TOOLCHAINS_ONLY = exports.INPUT_OVERWRITE_SETTINGS = exports.INPUT_SETTINGS_PATH = exports.INPUT_SERVER_PASSWORD = exports.INPUT_SERVER_USERNAME = exports.INPUT_SERVER_ID = exports.INPUT_CHECK_LATEST = exports.INPUT_JDK_FILE = exports.INPUT_DISTRIBUTION = exports.INPUT_JAVA_PACKAGE = exports.INPUT_ARCHITECTURE = exports.INPUT_JAVA_VERSION_FILE = exports.INPUT_JAVA_VERSION = exports.MACOS_JAVA_CONTENT_POSTFIX = void 0;
 exports.MACOS_JAVA_CONTENT_POSTFIX = 'Contents/Home';
 exports.INPUT_JAVA_VERSION = 'java-version';
 exports.INPUT_JAVA_VERSION_FILE = 'java-version-file';
@ -123469,6 +123467,9 @@ exports.INPUT_SERVER_USERNAME = 'server-username';
 exports.INPUT_SERVER_PASSWORD = 'server-password';
 exports.INPUT_SETTINGS_PATH = 'settings-path';
 exports.INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
+exports.INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
+exports.INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
+exports.INPUT_ADD_TO_PATH = 'add-to-env-path';
 exports.INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
 exports.INPUT_GPG_PASSPHRASE = 'gpg-passphrase';
 exports.INPUT_DEFAULT_GPG_PRIVATE_KEY = undefined;
@ -123578,9 +123579,12 @@ class AdoptDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            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);
+            }
            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);
@ -123727,6 +123731,8 @@ class JavaBase {
        this.architecture = installerOptions.architecture || os_1.default.arch();
        this.packageType = installerOptions.packageType;
        this.checkLatest = installerOptions.checkLatest;
+        this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
+        this.addToEnvPath = installerOptions.addToEnvPath;
    }
    setupJava() {
        return __awaiter(this, void 0, void 0, function* () {
@ -123828,8 +123834,18 @@ class JavaBase {
    }
    setJavaDefault(version, toolPath) {
        const majorVersion = version.split('.')[0];
+        if (this.updateEnvJavaHome) {
            core.exportVariable('JAVA_HOME', toolPath);
+        }
+        else {
+            core.info(`Skip updating env.JAVA_HOME according to ${constants_1.INPUT_UPDATE_JAVA_HOME}`);
+        }
+        if (this.addToEnvPath) {
            core.addPath(path_1.default.join(toolPath, 'bin'));
+        }
+        else {
+            core.info(`Skip adding to env.PATH according to ${constants_1.INPUT_ADD_TO_PATH}`);
+        }
        core.setOutput('distribution', this.distribution);
        core.setOutput('path', toolPath);
        core.setOutput('version', version);
@ -123914,9 +123930,13 @@ class CorrettoDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
            core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
+            const extension = (0, util_1.getDownloadArchiveExtension)();
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            }
+            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);
@ -124209,9 +124229,13 @@ class DragonwellDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
            core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
+            const extension = (0, util_1.getDownloadArchiveExtension)();
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            }
+            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);
@ -124375,9 +124399,12 @@ class GraalVMDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            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);
+            }
            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);
@ -124543,11 +124570,8 @@ class LibericaDistributions extends base_installer_1.JavaBase {
            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
            core.info(`Extracting Java archive...`);
            const extension = (0, util_1.getDownloadArchiveExtension)();
-            if (process.platform === 'win32' &&
-                (this.architecture === 'arm64' || this.architecture === 'aarch64')) {
-                const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-                yield fs_1.default.renameSync(javaArchivePath, javaArchivePathRenamed);
-                javaArchivePath = javaArchivePathRenamed;
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
            }
            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
@ -124829,19 +124853,11 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
        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);
-            // Rename archive to add extension because after downloading
-            // archive does not contain extension type and it leads to some issues
-            // on Windows runners without PowerShell Core.
-            //
-            // For default PowerShell Windows it should contain extension type to unpack it.
-            if (process.platform === 'win32' &&
-                (this.architecture === 'arm64' || this.architecture === 'aarch64')) {
-                const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-                yield fs_1.default.renameSync(javaArchivePath, javaArchivePathRenamed);
-                javaArchivePath = javaArchivePathRenamed;
-            }
            core.info(`Extracting Java archive...`);
            const extension = (0, util_1.getDownloadArchiveExtension)();
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            }
            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);
@ -124978,9 +124994,12 @@ class OracleDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            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);
+            }
            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);
@ -125151,9 +125170,13 @@ class SapMachineDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
            core.info(`Extracting Java archive...`);
-            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
+            const extension = (0, util_1.getDownloadArchiveExtension)();
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            }
+            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);
@ -125370,9 +125393,12 @@ class SemeruDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            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);
+            }
            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);
@ -125546,9 +125572,12 @@ class TemurinDistribution extends base_installer_1.JavaBase {
    downloadTool(javaRelease) {
        return __awaiter(this, void 0, void 0, function* () {
            core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`);
-            const javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            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);
+            }
            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);
@ -125724,11 +125753,8 @@ class ZuluDistribution extends base_installer_1.JavaBase {
            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
            core.info(`Extracting Java archive...`);
            const extension = (0, util_1.getDownloadArchiveExtension)();
-            if (process.platform === 'win32' &&
-                (this.architecture === 'arm64' || this.architecture === 'aarch64')) {
-                const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-                yield fs_1.default.renameSync(javaArchivePath, javaArchivePathRenamed);
-                javaArchivePath = javaArchivePathRenamed;
+            if (process.platform === 'win32') {
+                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
            }
            const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
            const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
@ -125957,6 +125983,10 @@ function run() {
            const cache = core.getInput(constants.INPUT_CACHE);
            const cacheDependencyPath = core.getInput(constants.INPUT_CACHE_DEPENDENCY_PATH);
            const checkLatest = (0, util_1.getBooleanInput)(constants.INPUT_CHECK_LATEST, false);
+            const updateToolchainsOnly = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_TOOLCHAINS_ONLY, false);
+            const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, !updateToolchainsOnly);
+            const updateEnvJavaHome = (0, util_1.getBooleanInput)(constants.INPUT_UPDATE_JAVA_HOME, !updateToolchainsOnly);
+            const addToEnvPath = (0, util_1.getBooleanInput)(constants.INPUT_ADD_TO_PATH, !updateToolchainsOnly);
            let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);
            core.startGroup('Installed distributions');
            if (versions.length !== toolchainIds.length) {
@ -125971,7 +126001,11 @@ function run() {
                checkLatest,
                distributionName,
                jdkFile,
-                toolchainIds
+                toolchainIds,
+                updateToolchainsOnly,
+                overwriteSettings,
+                updateEnvJavaHome,
+                addToEnvPath
            };
            if (!versions.length) {
                core.debug('java-version input is empty, looking for java-version-file input');
@ -125989,7 +126023,7 @@ function run() {
            core.endGroup();
            const matchersPath = path.join(__dirname, '..', '..', '.github');
            core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);
-            yield auth.configureAuthentication();
+            yield auth.configureAuthentication(overwriteSettings);
            if (cache && (0, util_1.isCacheFeatureAvailable)()) {
                yield (0, cache_1.restore)(cache, cacheDependencyPath);
            }
@ -126002,19 +126036,21 @@ function run() {
 run();
 function installVersion(version, options, toolchainId = 0) {
    return __awaiter(this, void 0, void 0, function* () {
-        const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds } = options;
+        const { distributionName, jdkFile, architecture, packageType, checkLatest, toolchainIds, updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath } = options;
        const installerOptions = {
+            version,
            architecture,
            packageType,
            checkLatest,
-            version
+            updateEnvJavaHome,
+            addToEnvPath
        };
        const distribution = (0, distribution_factory_1.getJavaDistribution)(distributionName, installerOptions, jdkFile);
        if (!distribution) {
            throw new Error(`No supported distribution was found for input ${distributionName}`);
        }
        const result = yield distribution.setupJava();
-        yield toolchains.configureToolchains(version, distributionName, result.path, toolchainIds[toolchainId]);
+        yield toolchains.configureToolchains(version, distributionName, result.path, overwriteSettings || updateToolchainsOnly, toolchainIds[toolchainId]);
        core.info('');
        core.info('Java configuration:');
        core.info(`  Distribution: ${distributionName}`);
@ -126072,15 +126108,13 @@ const path = __importStar(__nccwpck_require__(71017));
 const core = __importStar(__nccwpck_require__(42186));
 const io = __importStar(__nccwpck_require__(47351));
 const constants = __importStar(__nccwpck_require__(69042));
-const util_1 = __nccwpck_require__(92629);
 const xmlbuilder2_1 = __nccwpck_require__(70151);
-function configureToolchains(version, distributionName, jdkHome, toolchainId) {
+function configureToolchains(version, distributionName, jdkHome, updateToolchains, toolchainId) {
    return __awaiter(this, void 0, void 0, function* () {
        const vendor = core.getInput(constants.INPUT_MVN_TOOLCHAIN_VENDOR) || distributionName;
        const id = toolchainId || `${vendor}_${version}`;
        const settingsDirectory = core.getInput(constants.INPUT_SETTINGS_PATH) ||
            path.join(os.homedir(), constants.M2_DIR);
-        const overwriteSettings = (0, util_1.getBooleanInput)(constants.INPUT_OVERWRITE_SETTINGS, true);
        yield createToolchainsSettings({
            jdkInfo: {
                version,
@ -126089,20 +126123,20 @@ function configureToolchains(version, distributionName, jdkHome, toolchainId) {
                jdkHome
            },
            settingsDirectory,
-            overwriteSettings
+            updateToolchains
        });
    });
 }
 exports.configureToolchains = configureToolchains;
-function createToolchainsSettings({ jdkInfo, settingsDirectory, overwriteSettings }) {
+function createToolchainsSettings({ jdkInfo, settingsDirectory, updateToolchains }) {
    return __awaiter(this, void 0, void 0, function* () {
-        core.info(`Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
+        core.info(`Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`);
        // when an alternate m2 location is specified use only that location (no .m2 directory)
        // otherwise use the home/.m2/ path
        yield io.mkdirP(settingsDirectory);
        const originalToolchains = yield readExistingToolchainsFile(settingsDirectory);
        const updatedToolchains = generateToolchainDefinition(originalToolchains, jdkInfo.version, jdkInfo.vendor, jdkInfo.id, jdkInfo.jdkHome);
-        yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, overwriteSettings);
+        yield writeToolchainsFileToDisk(settingsDirectory, updatedToolchains, updateToolchains);
    });
 }
 exports.createToolchainsSettings = createToolchainsSettings;
@ -126168,18 +126202,18 @@ function readExistingToolchainsFile(directory) {
        return '';
    });
 }
-function writeToolchainsFileToDisk(directory, settings, overwriteSettings) {
+function writeToolchainsFileToDisk(directory, settings, updateToolchains) {
    return __awaiter(this, void 0, void 0, function* () {
        const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
-        const settingsExists = fs.existsSync(location);
-        if (settingsExists && overwriteSettings) {
-            core.info(`Overwriting existing file ${location}`);
+        const toolchainsExists = fs.existsSync(location);
+        if (toolchainsExists && updateToolchains) {
+            core.info(`Updating existing file ${location}`);
        }
-        else if (!settingsExists) {
-            core.info(`Writing to ${location}`);
+        else if (!toolchainsExists) {
+            core.info(`Creating file ${location}`);
        }
        else {
-            core.info(`Skipping generation of ${location} because file already exists and overwriting is not enabled`);
+            core.info(`Skipping update of ${location} since file already exists and updating is not enabled`);
            return;
        }
        return fs.writeFileSync(location, settings, {
@ -126233,7 +126267,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getGitHubHttpHeaders = exports.convertVersionToSemver = exports.getVersionFromFileContent = exports.isCacheFeatureAvailable = exports.isGhes = exports.isJobStatusSuccess = exports.getToolcachePath = exports.isVersionSatisfies = exports.getDownloadArchiveExtension = exports.extractJdkFile = exports.getVersionFromToolcachePath = exports.getBooleanInput = exports.getTempDir = void 0;
+exports.renameWinArchive = exports.getGitHubHttpHeaders = exports.convertVersionToSemver = exports.getVersionFromFileContent = exports.isCacheFeatureAvailable = exports.isGhes = exports.isJobStatusSuccess = exports.getToolcachePath = exports.isVersionSatisfies = exports.getDownloadArchiveExtension = exports.extractJdkFile = exports.getVersionFromToolcachePath = exports.getBooleanInput = exports.getTempDir = void 0;
 const os_1 = __importDefault(__nccwpck_require__(22037));
 const path_1 = __importDefault(__nccwpck_require__(71017));
 const fs = __importStar(__nccwpck_require__(57147));
@ -126315,7 +126349,11 @@ function isJobStatusSuccess() {
 exports.isJobStatusSuccess = isJobStatusSuccess;
 function isGhes() {
    const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://github.com');
-    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+    const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+    const isGitHubHost = hostname === 'GITHUB.COM';
+    const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+    const isLocalHost = hostname.endsWith('.LOCALHOST');
+    return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
@ -126393,6 +126431,17 @@ function getGitHubHttpHeaders() {
    return headers;
 }
 exports.getGitHubHttpHeaders = getGitHubHttpHeaders;
+// Rename archive to add extension because after downloading
+// archive does not contain extension type and it leads to some issues
+// on Windows runners without PowerShell Core.
+//
+// For default PowerShell Windows it should contain extension type to unpack it.
+function renameWinArchive(javaArchivePath) {
+    const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+    fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+    return javaArchivePathRenamed;
+}
+exports.renameWinArchive = renameWinArchive;


 /***/ }),
--- a/package-lock.json
+++ b/package-lock.json
@ -4322,12 +4322,12 @@
      }
    },
    "node_modules/micromatch": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
-      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
      "dev": true,
      "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
        "picomatch": "^2.3.1"
      },
      "engines": {
--- a/src/auth.ts
+++ b/src/auth.ts
@ -10,17 +10,13 @@ import * as constants from './constants';
 import * as gpg from './gpg';
 import {getBooleanInput} from './util';

-export async function configureAuthentication() {
+export async function configureAuthentication(overwriteSettings: boolean) {
  const id = core.getInput(constants.INPUT_SERVER_ID);
  const username = core.getInput(constants.INPUT_SERVER_USERNAME);
  const password = core.getInput(constants.INPUT_SERVER_PASSWORD);
  const settingsDirectory =
    core.getInput(constants.INPUT_SETTINGS_PATH) ||
    path.join(os.homedir(), constants.M2_DIR);
-  const overwriteSettings = getBooleanInput(
-    constants.INPUT_OVERWRITE_SETTINGS,
-    true
-  );
  const gpgPrivateKey =
    core.getInput(constants.INPUT_GPG_PRIVATE_KEY) ||
    constants.INPUT_DEFAULT_GPG_PRIVATE_KEY;
--- a/src/constants.ts
+++ b/src/constants.ts
@ -11,6 +11,9 @@ export const INPUT_SERVER_USERNAME = 'server-username';
 export const INPUT_SERVER_PASSWORD = 'server-password';
 export const INPUT_SETTINGS_PATH = 'settings-path';
 export const INPUT_OVERWRITE_SETTINGS = 'overwrite-settings';
+export const INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only';
+export const INPUT_UPDATE_JAVA_HOME = 'update-env-javahome';
+export const INPUT_ADD_TO_PATH = 'add-to-env-path';
 export const INPUT_GPG_PRIVATE_KEY = 'gpg-private-key';
 export const INPUT_GPG_PASSPHRASE = 'gpg-passphrase';

--- a/src/distributions/adopt/installer.ts
+++ b/src/distributions/adopt/installer.ts
@ -15,7 +15,8 @@ import {
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';

 export enum AdoptImplementation {
@ -73,11 +74,13 @@ export class AdoptDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@ -10,7 +10,11 @@ import {
  JavaInstallerOptions,
  JavaInstallerResults
 } from './base-models';
-import {MACOS_JAVA_CONTENT_POSTFIX} from '../constants';
+import {
+  MACOS_JAVA_CONTENT_POSTFIX,
+  INPUT_UPDATE_JAVA_HOME,
+  INPUT_ADD_TO_PATH
+} from '../constants';
 import os from 'os';

 export abstract class JavaBase {
@ -20,6 +24,8 @@ export abstract class JavaBase {
  protected packageType: string;
  protected stable: boolean;
  protected checkLatest: boolean;
+  protected updateEnvJavaHome: boolean;
+  protected addToEnvPath: boolean;

  constructor(
    protected distribution: string,
@ -36,6 +42,8 @@ export abstract class JavaBase {
    this.architecture = installerOptions.architecture || os.arch();
    this.packageType = installerOptions.packageType;
    this.checkLatest = installerOptions.checkLatest;
+    this.updateEnvJavaHome = installerOptions.updateEnvJavaHome;
+    this.addToEnvPath = installerOptions.addToEnvPath;
  }

  protected abstract downloadTool(
@ -163,8 +171,18 @@ export abstract class JavaBase {

  protected setJavaDefault(version: string, toolPath: string) {
    const majorVersion = version.split('.')[0];
+    if (this.updateEnvJavaHome) {
      core.exportVariable('JAVA_HOME', toolPath);
+    } else {
+      core.info(
+        `Skip updating env.JAVA_HOME according to ${INPUT_UPDATE_JAVA_HOME}`
+      );
+    }
+    if (this.addToEnvPath) {
      core.addPath(path.join(toolPath, 'bin'));
+    } else {
+      core.info(`Skip adding to env.PATH according to ${INPUT_ADD_TO_PATH}`);
+    }
    core.setOutput('distribution', this.distribution);
    core.setOutput('path', toolPath);
    core.setOutput('version', version);
--- a/src/distributions/base-models.ts
+++ b/src/distributions/base-models.ts
@ -3,6 +3,8 @@ export interface JavaInstallerOptions {
  architecture: string;
  packageType: string;
  checkLatest: boolean;
+  updateEnvJavaHome: boolean;
+  addToEnvPath: boolean;
 }

 export interface JavaInstallerResults {
--- a/src/distributions/corretto/installer.ts
+++ b/src/distributions/corretto/installer.ts
@ -5,7 +5,8 @@ import path from 'path';
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  convertVersionToSemver
+  convertVersionToSemver,
+  renameWinArchive
 } from '../../util';
 import {JavaBase} from '../base-installer';
 import {
@ -29,14 +30,14 @@ export class CorrettoDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
+    const extension = getDownloadArchiveExtension();
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

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

    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
+    const extension = getDownloadArchiveExtension();
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
    const archivePath = path.join(extractedJavaPath, archiveName);
--- a/src/distributions/graalvm/installer.ts
+++ b/src/distributions/graalvm/installer.ts
@ -13,7 +13,8 @@ import {
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  getGitHubHttpHeaders
+  getGitHubHttpHeaders,
+  renameWinArchive
 } from '../../util';
 import {HttpCodes} from '@actions/http-client';
 import {GraalVMEAVersion} from './models';
@ -33,11 +34,13 @@ export class GraalVMDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
--- a/src/distributions/liberica/installer.ts
+++ b/src/distributions/liberica/installer.ts
@ -8,7 +8,8 @@ import semver from 'semver';
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';
 import * as core from '@actions/core';
 import {ArchitectureOptions, LibericaVersion, OsVersions} from './models';
@ -35,13 +36,8 @@ export class LibericaDistributions extends JavaBase {

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-    if (
-      process.platform === 'win32' &&
-      (this.architecture === 'arm64' || this.architecture === 'aarch64')
-    ) {
-      const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-      await fs.renameSync(javaArchivePath, javaArchivePathRenamed);
-      javaArchivePath = javaArchivePathRenamed;
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

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

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
--- a/src/distributions/oracle/installer.ts
+++ b/src/distributions/oracle/installer.ts
@ -10,7 +10,11 @@ import {
  JavaInstallerOptions,
  JavaInstallerResults
 } from '../base-models';
-import {extractJdkFile, getDownloadArchiveExtension} from '../../util';
+import {
+  extractJdkFile,
+  getDownloadArchiveExtension,
+  renameWinArchive
+} from '../../util';
 import {HttpCodes} from '@actions/http-client';

 const ORACLE_DL_BASE = 'https://download.oracle.com/java';
@ -26,11 +30,13 @@ export class OracleDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
--- a/src/distributions/sapmachine/installer.ts
+++ b/src/distributions/sapmachine/installer.ts
@ -9,7 +9,8 @@ import {
  extractJdkFile,
  getDownloadArchiveExtension,
  getGitHubHttpHeaders,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';
 import {JavaBase} from '../base-installer';
 import {
@ -104,14 +105,14 @@ export class SapMachineDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
-
-    const extractedJavaPath = await extractJdkFile(
-      javaArchivePath,
-      getDownloadArchiveExtension()
-    );
+    const extension = getDownloadArchiveExtension();
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
+    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
    const archivePath = path.join(extractedJavaPath, archiveName);
--- a/src/distributions/semeru/installer.ts
+++ b/src/distributions/semeru/installer.ts
@ -8,7 +8,8 @@ import semver from 'semver';
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';
 import * as core from '@actions/core';
 import * as tc from '@actions/tool-cache';
@ -98,11 +99,13 @@ export class SemeruDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath: string = await extractJdkFile(
      javaArchivePath,
      extension
--- a/src/distributions/temurin/installer.ts
+++ b/src/distributions/temurin/installer.ts
@ -15,7 +15,8 @@ import {
 import {
  extractJdkFile,
  getDownloadArchiveExtension,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';

 export enum TemurinImplementation {
@ -76,11 +77,13 @@ export class TemurinDistribution extends JavaBase {
    core.info(
      `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
    );
-    const javaArchivePath = await tc.downloadTool(javaRelease.url);
+    let javaArchivePath = await tc.downloadTool(javaRelease.url);

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
+    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

    const archiveName = fs.readdirSync(extractedJavaPath)[0];
--- a/src/distributions/zulu/installer.ts
+++ b/src/distributions/zulu/installer.ts
@ -11,7 +11,8 @@ import {
  extractJdkFile,
  getDownloadArchiveExtension,
  convertVersionToSemver,
-  isVersionSatisfies
+  isVersionSatisfies,
+  renameWinArchive
 } from '../../util';
 import {
  JavaDownloadRelease,
@ -80,13 +81,8 @@ export class ZuluDistribution extends JavaBase {

    core.info(`Extracting Java archive...`);
    const extension = getDownloadArchiveExtension();
-    if (
-      process.platform === 'win32' &&
-      (this.architecture === 'arm64' || this.architecture === 'aarch64')
-    ) {
-      const javaArchivePathRenamed = `${javaArchivePath}.zip`;
-      await fs.renameSync(javaArchivePath, javaArchivePathRenamed);
-      javaArchivePath = javaArchivePathRenamed;
+    if (process.platform === 'win32') {
+      javaArchivePath = renameWinArchive(javaArchivePath);
    }
    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);

--- a/src/setup-java.ts
+++ b/src/setup-java.ts
@ -13,6 +13,19 @@ import * as path from 'path';
 import {getJavaDistribution} from './distributions/distribution-factory';
 import {JavaInstallerOptions} from './distributions/base-models';

+interface IInstallerInputsOptions {
+  architecture: string;
+  packageType: string;
+  checkLatest: boolean;
+  distributionName: string;
+  jdkFile: string;
+  toolchainIds: Array<string>;
+  updateToolchainsOnly: boolean;
+  overwriteSettings: boolean;
+  updateEnvJavaHome: boolean;
+  addToEnvPath: boolean;
+}
+
 async function run() {
  try {
    const versions = core.getMultilineInput(constants.INPUT_JAVA_VERSION);
@ -28,6 +41,23 @@ async function run() {
      constants.INPUT_CACHE_DEPENDENCY_PATH
    );
    const checkLatest = getBooleanInput(constants.INPUT_CHECK_LATEST, false);
+    const updateToolchainsOnly = getBooleanInput(
+      constants.INPUT_UPDATE_TOOLCHAINS_ONLY,
+      false
+    );
+    const overwriteSettings = getBooleanInput(
+      constants.INPUT_OVERWRITE_SETTINGS,
+      !updateToolchainsOnly
+    );
+    const updateEnvJavaHome = getBooleanInput(
+      constants.INPUT_UPDATE_JAVA_HOME,
+      !updateToolchainsOnly
+    );
+    const addToEnvPath = getBooleanInput(
+      constants.INPUT_ADD_TO_PATH,
+      !updateToolchainsOnly
+    );
+
    let toolchainIds = core.getMultilineInput(constants.INPUT_MVN_TOOLCHAIN_ID);

    core.startGroup('Installed distributions');
@ -40,13 +70,17 @@ async function run() {
      throw new Error('java-version or java-version-file input expected');
    }

-    const installerInputsOptions: installerInputsOptions = {
+    const installerInputsOptions: IInstallerInputsOptions = {
      architecture,
      packageType,
      checkLatest,
      distributionName,
      jdkFile,
-      toolchainIds
+      toolchainIds,
+      updateToolchainsOnly,
+      overwriteSettings,
+      updateEnvJavaHome,
+      addToEnvPath
    };

    if (!versions.length) {
@ -78,7 +112,7 @@ async function run() {
    const matchersPath = path.join(__dirname, '..', '..', '.github');
    core.info(`##[add-matcher]${path.join(matchersPath, 'java.json')}`);

-    await auth.configureAuthentication();
+    await auth.configureAuthentication(overwriteSettings);
    if (cache && isCacheFeatureAvailable()) {
      await restore(cache, cacheDependencyPath);
    }
@ -91,7 +125,7 @@ run();

 async function installVersion(
  version: string,
-  options: installerInputsOptions,
+  options: IInstallerInputsOptions,
  toolchainId = 0
 ) {
  const {
@ -100,14 +134,20 @@ async function installVersion(
    architecture,
    packageType,
    checkLatest,
-    toolchainIds
+    toolchainIds,
+    updateToolchainsOnly,
+    overwriteSettings,
+    updateEnvJavaHome,
+    addToEnvPath
  } = options;

  const installerOptions: JavaInstallerOptions = {
+    version,
    architecture,
    packageType,
    checkLatest,
-    version
+    updateEnvJavaHome,
+    addToEnvPath
  };

  const distribution = getJavaDistribution(
@ -126,6 +166,7 @@ async function installVersion(
    version,
    distributionName,
    result.path,
+    overwriteSettings || updateToolchainsOnly,
    toolchainIds[toolchainId]
  );

@ -136,12 +177,3 @@ async function installVersion(
  core.info(`  Path: ${result.path}`);
  core.info('');
 }
-
-interface installerInputsOptions {
-  architecture: string;
-  packageType: string;
-  checkLatest: boolean;
-  distributionName: string;
-  jdkFile: string;
-  toolchainIds: Array<string>;
-}
--- a/src/toolchains.ts
+++ b/src/toolchains.ts
@ -19,6 +19,7 @@ export async function configureToolchains(
  version: string,
  distributionName: string,
  jdkHome: string,
+  updateToolchains: boolean,
  toolchainId?: string
 ) {
  const vendor =
@ -27,10 +28,6 @@ export async function configureToolchains(
  const settingsDirectory =
    core.getInput(constants.INPUT_SETTINGS_PATH) ||
    path.join(os.homedir(), constants.M2_DIR);
-  const overwriteSettings = getBooleanInput(
-    constants.INPUT_OVERWRITE_SETTINGS,
-    true
-  );

  await createToolchainsSettings({
    jdkInfo: {
@ -40,21 +37,21 @@ export async function configureToolchains(
      jdkHome
    },
    settingsDirectory,
-    overwriteSettings
+    updateToolchains
  });
 }

 export async function createToolchainsSettings({
  jdkInfo,
  settingsDirectory,
-  overwriteSettings
+  updateToolchains
 }: {
  jdkInfo: JdkInfo;
  settingsDirectory: string;
-  overwriteSettings: boolean;
+  updateToolchains: boolean;
 }) {
  core.info(
-    `Creating ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`
+    `Adding a toolchain entry in ${constants.MVN_TOOLCHAINS_FILE} for JDK version ${jdkInfo.version} from ${jdkInfo.vendor}`
  );
  // when an alternate m2 location is specified use only that location (no .m2 directory)
  // otherwise use the home/.m2/ path
@ -72,7 +69,7 @@ export async function createToolchainsSettings({
  await writeToolchainsFileToDisk(
    settingsDirectory,
    updatedToolchains,
-    overwriteSettings
+    updateToolchains
  );
 }

@ -147,17 +144,17 @@ async function readExistingToolchainsFile(directory: string) {
 async function writeToolchainsFileToDisk(
  directory: string,
  settings: string,
-  overwriteSettings: boolean
+  updateToolchains: boolean
 ) {
  const location = path.join(directory, constants.MVN_TOOLCHAINS_FILE);
-  const settingsExists = fs.existsSync(location);
-  if (settingsExists && overwriteSettings) {
-    core.info(`Overwriting existing file ${location}`);
-  } else if (!settingsExists) {
-    core.info(`Writing to ${location}`);
+  const toolchainsExists = fs.existsSync(location);
+  if (toolchainsExists && updateToolchains) {
+    core.info(`Updating existing file ${location}`);
+  } else if (!toolchainsExists) {
+    core.info(`Creating file ${location}`);
  } else {
    core.info(
-      `Skipping generation of ${location} because file already exists and overwriting is not enabled`
+      `Skipping update of ${location} since file already exists and updating is not enabled`
    );
    return;
  }
--- a/src/util.ts
+++ b/src/util.ts
@ -92,7 +92,13 @@ export function isGhes(): boolean {
  const ghUrl = new URL(
    process.env['GITHUB_SERVER_URL'] || 'https://github.com'
  );
-  return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
+
+  const hostname = ghUrl.hostname.trimEnd().toUpperCase();
+  const isGitHubHost = hostname === 'GITHUB.COM';
+  const isGitHubEnterpriseCloudHost = hostname.endsWith('.GHE.COM');
+  const isLocalHost = hostname.endsWith('.LOCALHOST');
+
+  return !isGitHubHost && !isGitHubEnterpriseCloudHost && !isLocalHost;
 }

 export function isCacheFeatureAvailable(): boolean {
@ -190,3 +196,14 @@ export function getGitHubHttpHeaders(): OutgoingHttpHeaders {
  }
  return headers;
 }
+
+// Rename archive to add extension because after downloading
+// archive does not contain extension type and it leads to some issues
+// on Windows runners without PowerShell Core.
+//
+// For default PowerShell Windows it should contain extension type to unpack it.
+export function renameWinArchive(javaArchivePath: string): string {
+  const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+  fs.renameSync(javaArchivePath, javaArchivePathRenamed);
+  return javaArchivePathRenamed;
+}
Author	SHA1	Message	Date
Markus Hoffrogge	f165d47677	Merge `8bb7cab8d1` into `8df1039502`	2024-11-15 08:41:24 -05:00
John Wesley Walker III	8df1039502	Refine `isGhes` logic (#697 )	2024-10-21 19:57:52 +02:00
mahabaleshwars	870c199c48	Update workflows for GraalVM and Version Enhancements (#699 ) * workflow update graalvm version * updated workflow for publish action version update	2024-10-21 11:43:20 -05:00
Priya Gupta	83a06ff9d9	Fix Windows archives extraction issue (#689 )	2024-10-10 16:32:25 -05:00
Markus Hoffrogge	8bb7cab8d1	Update compiled dist scripts after re-base to main	2024-08-23 23:50:09 +02:00
Markus Hoffrogge	d299400510	Update from npm run format to fix prettier check - missed in initial commit - took re-built dist from GH actions	2024-08-23 23:50:09 +02:00
Markus Hoffrogge	a368241022	Update README.md	2024-08-23 23:50:08 +02:00
Markus Hoffrogge	19a6381cef	Add inputs 'update-toolchains-only', 'update-env-javahome', 'add-to-env-path' Changes in detail: ------------------ - action.yml: - add inputs: - update-toolchains-only - update-env-javahome - add-to-env-path - update description for input "overwrite-settings" - remove default value of input "overwrite-settings", since the default is now propagated from input 'update-toolchains-only' - base-models.ts: - extend interface JavaInstallerOptions: - add fields: - updateEnvJavaHome: boolean; - addToEnvPath: boolean; - constants.ts: - add constant INPUT_UPDATE_TOOLCHAINS_ONLY = 'update-toolchains-only' - auth.ts: - function configureAuthentication(): - add parameter: - overwriteSettings: boolean - remove the now obsolete const overwriteSettings - toolchains.ts: - function configureToolchains(...): - add parameter updateToolchains: boolean - remove the now obsolete const overwriteSettings - improve variable naming: - rename any occurrence of 'overwriteSettings' by 'updateToolchains' - add field updateToolchains: boolean to the parameter object - function writeToolchainsFileToDisk(...): - improve variable naming: - rename variable 'settingsExists' by 'toolchainsExists' - update wording of info logs to be more applicable - setup-java.ts: - interface installerInputsOptions: - rename to IInstallerInputsOption to meet common coding convention - add fields: - updateToolchainsOnly: boolean; - overwriteSettings: boolean; - updateEnvJavaHome: boolean; - addToEnvPath: boolean; - function run(): - add const: - const updateToolchainsOnly: - get as boolean from input 'update-toolchains-only', default: false - const overwriteSettings: - get as boolean from input 'overwrite-settings', default: !updateToolchainsOnly - const updateEnvJavaHome: - get as boolean input 'update-env-javahome', default: !updateToolchainsOnly - const addToEnvPath: - get as boolean input 'add-to-env-path', default: !updateToolchainsOnly - extend const installerInputsOptions to match with IInstallerInputsOption: - add field updateToolchainsOnly - add field overwriteSettings - add field updateEnvJavaHome - add field addToEnvPath - update call of auth.configureAuthentication() to auth.configureAuthentication(overwriteSettings) - function installVersion(...): - add const and init from parameter options: - updateToolchainsOnly, overwriteSettings, updateEnvJavaHome, addToEnvPath - init the additional fields of installerInputsOptions accordingly - call toolchains.configureToolchains(...): - with parameter updateToolchains= overwriteSettings \|\| updateToolchainsOnly - base-installer.ts: - add constants to import from constants: - INPUT_UPDATE_JAVA_HOME - INPUT_ADD_TO_PATH - add fields: - protected updateEnvJavaHome: boolean; - protected addToEnvPath: boolean; - ctor: - init these fields from JavaInstallerOptions accoprdingly - function setJavaDefault(...): - if updateEnvJavaHome is false: - SKIP updating env.JAVA_HOME - log info: `Skip updating env.JAVA_HOME according to ${INPUT_UPDATE_JAVA_HOME}` - if addToEnvPath is false: - SKIP adding toolchain path to env.PATH - log info: `Skip adding to env.PATH according to ${INPUT_ADD_TO_PATH}`	2024-08-23 23:50:08 +02:00