Merge 3e517b9873 into 292cc14be8

.github/workflows/e2e-versions.yml

@@ -51,7 +51,7 @@ jobs:
             version: 21
           - distribution: graalvm
             os: macos-latest
-            version: 17.0.12
+            version: 17
           - distribution: graalvm
             os: windows-latest
             version: 21

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

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

__tests__/util.test.ts

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

dist/cleanup/index.js

@@ -88470,7 +88470,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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;
+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,11 +88552,7 @@ function isJobStatusSuccess() {
 exports.isJobStatusSuccess = isJobStatusSuccess;
 function isGhes() {
     const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://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;
+    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
@@ -88634,17 +88630,6 @@ 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;
 
 
 /***/ }),

dist/setup/index.js

@@ -123578,12 +123578,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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);
@@ -123917,13 +123914,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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 extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
             const archivePath = path_1.default.join(extractedJavaPath, archiveName);
             const version = this.getToolcacheVersionName(javaRelease.version);
@@ -124216,13 +124209,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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 extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
             const archivePath = path_1.default.join(extractedJavaPath, archiveName);
             const version = this.getToolcacheVersionName(javaRelease.version);
@@ -124386,12 +124375,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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);
@@ -124557,8 +124543,11 @@ 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') {
-                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            if (process.platform === 'win32' &&
+                (this.architecture === 'arm64' || this.architecture === 'aarch64')) {
+                const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+                yield fs_1.default.renameSync(javaArchivePath, javaArchivePathRenamed);
+                javaArchivePath = javaArchivePathRenamed;
             }
             const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
@@ -124840,11 +124829,19 @@ 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);
@@ -124981,12 +124978,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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);
@@ -125157,13 +125151,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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 extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, (0, util_1.getDownloadArchiveExtension)());
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
             const archivePath = path_1.default.join(extractedJavaPath, archiveName);
             const version = this.getToolcacheVersionName(javaRelease.version);
@@ -125380,12 +125370,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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);
@@ -125559,12 +125546,9 @@ 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} ...`);
-            let javaArchivePath = yield tc.downloadTool(javaRelease.url);
+            const 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);
@@ -125740,8 +125724,11 @@ 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') {
-                javaArchivePath = (0, util_1.renameWinArchive)(javaArchivePath);
+            if (process.platform === 'win32' &&
+                (this.architecture === 'arm64' || this.architecture === 'aarch64')) {
+                const javaArchivePathRenamed = `${javaArchivePath}.zip`;
+                yield fs_1.default.renameSync(javaArchivePath, javaArchivePathRenamed);
+                javaArchivePath = javaArchivePathRenamed;
             }
             const extractedJavaPath = yield (0, util_1.extractJdkFile)(javaArchivePath, extension);
             const archiveName = fs_1.default.readdirSync(extractedJavaPath)[0];
@@ -126246,7 +126233,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-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;
+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));
@@ -126328,11 +126315,7 @@ function isJobStatusSuccess() {
 exports.isJobStatusSuccess = isJobStatusSuccess;
 function isGhes() {
     const ghUrl = new URL(process.env['GITHUB_SERVER_URL'] || 'https://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;
+    return ghUrl.hostname.toUpperCase() !== 'GITHUB.COM';
 }
 exports.isGhes = isGhes;
 function isCacheFeatureAvailable() {
@@ -126410,17 +126393,6 @@ 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;
 
 
 /***/ }),

package-lock.json

@@ -4322,12 +4322,12 @@
       }
     },
     "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
       "dependencies": {
-        "braces": "^3.0.3",
+        "braces": "^3.0.2",
         "picomatch": "^2.3.1"
       },
       "engines": {

src/distributions/adopt/installer.ts

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

src/distributions/corretto/installer.ts

@@ -5,8 +5,7 @@ import path from 'path';
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  convertVersionToSemver,
-  renameWinArchive
+  convertVersionToSemver
 } from '../../util';
 import {JavaBase} from '../base-installer';
 import {
@@ -30,14 +29,14 @@ export class CorrettoDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
-    const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
-    const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
+
+    const extractedJavaPath = await extractJdkFile(
+      javaArchivePath,
+      getDownloadArchiveExtension()
+    );
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];
     const archivePath = path.join(extractedJavaPath, archiveName);

src/distributions/dragonwell/installer.ts

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

src/distributions/graalvm/installer.ts

@@ -13,8 +13,7 @@ import {
 import {
   extractJdkFile,
   getDownloadArchiveExtension,
-  getGitHubHttpHeaders,
-  renameWinArchive
+  getGitHubHttpHeaders
 } from '../../util';
 import {HttpCodes} from '@actions/http-client';
 import {GraalVMEAVersion} from './models';
@@ -34,13 +33,11 @@ export class GraalVMDistribution extends JavaBase {
     core.info(
       `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...`
     );
-    let javaArchivePath = await tc.downloadTool(javaRelease.url);
+    const javaArchivePath = await tc.downloadTool(javaRelease.url);
 
     core.info(`Extracting Java archive...`);
     const extension = getDownloadArchiveExtension();
-    if (process.platform === 'win32') {
-      javaArchivePath = renameWinArchive(javaArchivePath);
-    }
+
     const extractedJavaPath = await extractJdkFile(javaArchivePath, extension);
 
     const archiveName = fs.readdirSync(extractedJavaPath)[0];

src/distributions/liberica/installer.ts

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

src/distributions/microsoft/installer.ts

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

src/distributions/oracle/installer.ts

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

src/distributions/sapmachine/installer.ts

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

src/distributions/semeru/installer.ts

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

src/distributions/temurin/installer.ts

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

src/distributions/zulu/installer.ts

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

src/util.ts

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