From 8518f793dda1e99482d40a9b0524d0f14b92f4f2 Mon Sep 17 00:00:00 2001 From: Thach Nguyen Date: Wed, 27 Jul 2022 11:42:49 +0700 Subject: [PATCH] Bump version to release v5.0 --- README.md | 11 +++++++++++ action.yml | 2 +- dist/index.js | 5 +++-- package.json | 1 - src/installer.ts | 7 +++++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 505fcf7..2d4e686 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,19 @@ Add this step into workflow jobs: ... steps: + - name: Set up Maven uses: stCarolas/setup-maven@v5 with: maven-version: 3.8.2 ``` + +### Development using [Docker](https://docs.docker.com/) + +Clone this repository and build the project with command + +```batch +docker run --rm -it -v "%PWD%:/usr/src/app" -w /usr/src/app node:12-alpine /bin/sh -c "npm i --no-bin-links && npm run format-check && npm run build" +``` + +**Note** that `%PWD%` is the project working directory in `Unix` format, such as: `/c/Users/source/repos/setup-maven` diff --git a/action.yml b/action.yml index a74b6ef..930c0f0 100644 --- a/action.yml +++ b/action.yml @@ -5,7 +5,7 @@ inputs: maven-version: description: 'Version Spec of the version to use. Examples: 3.x, 3.1.1, >=3.8.0' required: false - default: '3' + default: '3.8.2' runs: using: 'node12' main: 'dist/index.js' diff --git a/dist/index.js b/dist/index.js index 9344277..1851bb9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -4749,11 +4749,12 @@ function getMaven(version) { }); } exports.getMaven = getMaven; +const DOWNLOAD_BASE_URL = 'https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven'; function downloadMaven(version) { return __awaiter(this, void 0, void 0, function* () { const toolDirectoryName = `apache-maven-${version}`; - const downloadUrl = `https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${version}/${toolDirectoryName}-bin.tar.gz`; - core.debug(`Downloading ${downloadUrl}`); + const downloadUrl = `${DOWNLOAD_BASE_URL}/${version}/${toolDirectoryName}-bin.tar.gz`; + core.info(`Downloading Maven ${version} from ${downloadUrl} ...`); const downloadPath = yield tc.downloadTool(downloadUrl); const extractedPath = yield tc.extractTar(downloadPath); const toolRoot = path.join(extractedPath, toolDirectoryName); diff --git a/package.json b/package.json index c689a50..9ba14e4 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,6 @@ "@actions/core": "^1.2.6", "@actions/exec": "^1.0.0", "@actions/http-client": "^1.0.8", - "@actions/io": "^1.0.0", "@actions/tool-cache": "^1.3.1", "semver": "^6.1.1" }, diff --git a/src/installer.ts b/src/installer.ts index 16c38c2..b9bff9f 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -13,12 +13,15 @@ export async function getMaven(version: string) { core.addPath(path.join(toolPath, 'bin')); } +const DOWNLOAD_BASE_URL = 'https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven'; + async function downloadMaven(version: string): Promise { const toolDirectoryName = `apache-maven-${version}`; - const downloadUrl = `https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/${version}/${toolDirectoryName}-bin.tar.gz`; + const downloadUrl = `${DOWNLOAD_BASE_URL}/${version}/${toolDirectoryName}-bin.tar.gz`; - core.debug(`Downloading ${downloadUrl}`); + core.info(`Downloading Maven ${version} from ${downloadUrl} ...`); const downloadPath = await tc.downloadTool(downloadUrl); + const extractedPath = await tc.extractTar(downloadPath); const toolRoot = path.join(extractedPath, toolDirectoryName);