From eed97a9597f6feedaa4cb152497a82b034116ee1 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 20 Dec 2023 16:27:20 +0100 Subject: [PATCH] remove debug line and revert owner, branch --- dist/setup/index.js | 5 ++--- src/distributions/microsoft/installer.ts | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6f745a63..d09d9409 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -123968,7 +123968,6 @@ 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); - core.info(`javaArchivePath is ${javaArchivePath}`); core.info(`Extracting Java archive...`); const extension = (0, util_1.getDownloadArchiveExtension)(); if (process.platform === 'win32' && (this.architecture === 'arm64' || this.architecture === 'aarch64')) { @@ -124015,9 +124014,9 @@ class MicrosoftDistributions extends base_installer_1.JavaBase { return __awaiter(this, void 0, void 0, function* () { // TODO get these dynamically! // We will need Microsoft to add an endpoint where we can query for versions. - const owner = 'dmitry-shibanov'; + const owner = 'actions'; const repository = 'setup-java'; - const branch = 'v-dmshib/add-arm64-windows-microsoft'; + const branch = 'main'; const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json'; let releases = null; const fileUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`; diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts index 73bc2e78..22240c0b 100644 --- a/src/distributions/microsoft/installer.ts +++ b/src/distributions/microsoft/installer.ts @@ -27,7 +27,7 @@ export class MicrosoftDistributions extends JavaBase { `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaRelease.url} ...` ); let javaArchivePath = await tc.downloadTool(javaRelease.url); - core.info(`javaArchivePath is ${javaArchivePath}`); + core.info(`Extracting Java archive...`); const extension = getDownloadArchiveExtension(); if (process.platform === 'win32' && (this.architecture === 'arm64' || this.architecture === 'aarch64')) { @@ -93,9 +93,9 @@ export class MicrosoftDistributions extends JavaBase { private async getAvailableVersions(): Promise { // TODO get these dynamically! // We will need Microsoft to add an endpoint where we can query for versions. - const owner = 'dmitry-shibanov'; + const owner = 'actions'; const repository = 'setup-java'; - const branch = 'v-dmshib/add-arm64-windows-microsoft'; + const branch = 'main'; const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json';