Merge pull request #23 from wborn/update-lib

Apply recent changes
This commit is contained in:
stCarolas 2022-07-03 11:45:40 +03:00 committed by GitHub
commit 021645c4b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions

View File

@ -51,7 +51,7 @@ exports.getMaven = getMaven;
function downloadMaven(version) {
return __awaiter(this, void 0, void 0, function* () {
const toolDirectoryName = `apache-maven-${version}`;
const downloadUrl = `https://archive.apache.org/dist/maven/maven-3/${version}/binaries/${toolDirectoryName}-bin.tar.gz`;
const downloadUrl = `https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${version}/apache-maven-${version}-bin.tar.gz`;
console.log(`downloading ${downloadUrl}`);
try {
const downloadPath = yield tc.downloadTool(downloadUrl);

View File

@ -32,17 +32,16 @@ export async function getMaven(version: string) {
}
async function downloadMaven(version: string): Promise<string> {
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`
console.log(`downloading ${downloadUrl}`)
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`;
console.log(`downloading ${downloadUrl}`);
try {
const downloadPath = await tc.downloadTool(downloadUrl)
const extractedPath = await tc.extractTar(downloadPath)
let toolRoot = path.join(extractedPath, toolDirectoryName)
return await tc.cacheDir(toolRoot, 'maven', version)
const downloadPath = await tc.downloadTool(downloadUrl);
const extractedPath = await tc.extractTar(downloadPath);
let toolRoot = path.join(extractedPath, toolDirectoryName);
return await tc.cacheDir(toolRoot, 'maven', version);
} catch (err) {
throw err
throw err;
}
}