From 487be22239f6ce069098be25d329b766f2e88fe8 Mon Sep 17 00:00:00 2001 From: zhangjie Date: Sat, 5 Aug 2023 12:19:34 +0800 Subject: [PATCH] =?UTF-8?q?setup-java=20=E8=AE=BE=E7=BD=AEgithub=E4=BB=A3?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/setup/index.js | 5 ++--- src/distributions/temurin/installer.ts | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6cb8e80..8af4945 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -103413,9 +103413,8 @@ class TemurinDistribution extends base_installer_1.JavaBase { } downloadTool(javaRelease) { return __awaiter(this, void 0, void 0, function* () { - const javaReleaseUrl = 'http://yy.dsad.lol:8080/' + javaRelease.url; - core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaReleaseUrl} ...`); - const javaArchivePath = yield tc.downloadTool(javaReleaseUrl); + core.info(`Downloading Java ${javaRelease.version} (${this.distribution}) from http://yy.dsad.lol:8080/${javaRelease.url} ...`); + const javaArchivePath = yield tc.downloadTool('http://yy.dsad.lol:8080/' + javaRelease.url); core.info(`Extracting Java archive...`); const extension = util_1.getDownloadArchiveExtension(); const extractedJavaPath = yield util_1.extractJdkFile(javaArchivePath, extension); diff --git a/src/distributions/temurin/installer.ts b/src/distributions/temurin/installer.ts index 4560875..0587e8d 100644 --- a/src/distributions/temurin/installer.ts +++ b/src/distributions/temurin/installer.ts @@ -73,11 +73,10 @@ export class TemurinDistribution extends JavaBase { protected async downloadTool( javaRelease: JavaDownloadRelease ): Promise { - const javaReleaseUrl = 'http://yy.dsad.lol:8080/' + javaRelease.url; core.info( - `Downloading Java ${javaRelease.version} (${this.distribution}) from ${javaReleaseUrl} ...` + `Downloading Java ${javaRelease.version} (${this.distribution}) from http://yy.dsad.lol:8080/${javaRelease.url} ...` ); - const javaArchivePath = await tc.downloadTool(javaReleaseUrl); + const javaArchivePath = await tc.downloadTool('http://yy.dsad.lol:8080/' + javaRelease.url); core.info(`Extracting Java archive...`); const extension = getDownloadArchiveExtension();