diff --git a/LICENSE b/LICENSE index 2ac9b13..7745bc7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 stCarolas +Copyright (c) 2022 suisrc Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 88b4079..0ee6e7d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Add this step into workflow ``` - name: Set up Maven - uses: stCarolas/setup-maven@v5 + uses: suisrc/setup-maven-cn@v5.1 with: maven-version: 3.8.2 ``` diff --git a/action.yml b/action.yml index eaed535..9f01c39 100644 --- a/action.yml +++ b/action.yml @@ -1,6 +1,6 @@ name: 'Setup Maven' description: 'Install a specific version of Apache Maven and add it to the PATH' -author: 'stCarolas' +author: 'suisrc' inputs: maven-version: description: 'Version Spec of the version to use. Examples: 10.x, 10.15.1, >=10.15.0' diff --git a/lib/installer.js b/lib/installer.js index 74aa9ce..12f8f19 100644 --- a/lib/installer.js +++ b/lib/installer.js @@ -53,22 +53,26 @@ if (!tempDirectory) { } tempDirectory = path.join(baseLocation, 'actions', 'temp'); } -function getMaven(version) { +function getMaven(version, mirrors) { return __awaiter(this, void 0, void 0, function* () { let toolPath; toolPath = tc.find('maven', version); if (!toolPath) { - toolPath = yield downloadMaven(version); + toolPath = yield downloadMaven(version, mirrors); } toolPath = path.join(toolPath, 'bin'); core.addPath(toolPath); }); } exports.getMaven = getMaven; -function downloadMaven(version) { +function downloadMaven(version, mirrors) { return __awaiter(this, void 0, void 0, function* () { + if (!mirrors) { + mirrors = 'https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3'; + // https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven + } const toolDirectoryName = `apache-maven-${version}`; - const downloadUrl = `https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${version}/apache-maven-${version}-bin.tar.gz`; + const downloadUrl = `${mirrors}/${version}/apache-maven-${version}-bin.tar.gz`; console.log(`downloading ${downloadUrl}`); try { const downloadPath = yield tc.downloadTool(downloadUrl); diff --git a/lib/setup-maven.js b/lib/setup-maven.js index 4ef56e4..c0deb37 100644 --- a/lib/setup-maven.js +++ b/lib/setup-maven.js @@ -38,8 +38,9 @@ function run() { return __awaiter(this, void 0, void 0, function* () { try { let version = core.getInput('maven-version'); + let mirrors = core.getInput('maven-mirrors'); if (version) { - yield installer.getMaven(version); + yield installer.getMaven(version, mirrors); } } catch (error) { diff --git a/package.json b/package.json index aed0c09..82f2d2a 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "maven", "setup" ], - "author": "stCarolas", + "author": "suisrc", "license": "MIT", "dependencies": { "@actions/core": "^1.2.6", diff --git a/src/installer.ts b/src/installer.ts index 5eabd27..0391673 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -19,21 +19,25 @@ if (!tempDirectory) { tempDirectory = path.join(baseLocation, 'actions', 'temp'); } -export async function getMaven(version: string) { +export async function getMaven(version: string, mirrors: string): Promise { let toolPath: string; toolPath = tc.find('maven', version); if (!toolPath) { - toolPath = await downloadMaven(version); + toolPath = await downloadMaven(version, mirrors); } toolPath = path.join(toolPath, 'bin'); core.addPath(toolPath); } -async function downloadMaven(version: string): Promise { +async function downloadMaven(version: string, mirrors: string): Promise { + if (!mirrors) { + mirrors = 'https://mirrors.tuna.tsinghua.edu.cn/apache/maven/maven-3'; + // https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven + } const toolDirectoryName = `apache-maven-${version}`; - const downloadUrl = `https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${version}/apache-maven-${version}-bin.tar.gz`; + const downloadUrl = `${mirrors}/${version}/apache-maven-${version}-bin.tar.gz`; console.log(`downloading ${downloadUrl}`); try { diff --git a/src/setup-maven.ts b/src/setup-maven.ts index f25f53d..2623d54 100644 --- a/src/setup-maven.ts +++ b/src/setup-maven.ts @@ -4,8 +4,9 @@ import * as installer from './installer'; async function run() { try { let version = core.getInput('maven-version'); + let mirrors = core.getInput('maven-mirrors'); if (version) { - await installer.getMaven(version); + await installer.getMaven(version, mirrors); } } catch (error) { core.setFailed((error as Error).message);