From 6369b8f0c27ad0a95d4639fec090050d6667be13 Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 20 Dec 2021 00:25:04 +0100 Subject: [PATCH] Fix working dir (#241) Co-authored-by: CrazyMax --- action.yml | 1 - dist/index.js | 18 ++++++++---------- src/installer.ts | 6 +++--- src/main.ts | 13 +++++-------- 4 files changed, 16 insertions(+), 22 deletions(-) diff --git a/action.yml b/action.yml index 7b298c4..35c5cad 100644 --- a/action.yml +++ b/action.yml @@ -16,7 +16,6 @@ inputs: required: false workdir: description: 'Working directory (below repository root)' - default: '.' required: false runs: diff --git a/dist/index.js b/dist/index.js index dce9e04..1063dd9 100644 --- a/dist/index.js +++ b/dist/index.js @@ -97,13 +97,13 @@ function getMage(version) { throw new Error(`Cannot find Mage ${version} release`); } const semver = release.tag_name.replace(/^v/, ''); - core.info(`✅ Mage version found: ${release.tag_name}`); + core.info(`Mage version found: ${release.tag_name}`); const filename = getFilename(semver); const downloadUrl = util.format('https://github.com/magefile/mage/releases/download/%s/%s', release.tag_name, filename); - core.info(`⬇️ Downloading ${downloadUrl}...`); + core.info(`Downloading ${downloadUrl}...`); const downloadPath = yield tc.downloadTool(downloadUrl); core.debug(`Downloaded to ${downloadPath}`); - core.info('📦 Extracting Mage...'); + core.info('Extracting Mage...'); let extPath; if (osPlat == 'win32') { extPath = yield tc.extractZip(downloadPath); @@ -172,14 +172,12 @@ function run() { try { const version = core.getInput('version') || 'latest'; const args = core.getInput('args'); - const workdir = core.getInput('workdir') || '.'; + const workdir = core.getInput('workdir') || process.env['GITHUB_WORKSPACE'] || '.'; const mage = yield installer.getMage(version); - if (workdir && workdir !== '.') { - core.info(`📂 Using ${workdir} as working directory...`); - process.chdir(workdir); - } - core.info('🏃 Running Mage...'); - yield exec.exec(`${mage} ${args}`); + core.info('Running Mage...'); + yield exec.exec(`${mage} ${args}`, undefined, { + cwd: workdir + }); } catch (error) { core.setFailed(error.message); diff --git a/src/installer.ts b/src/installer.ts index 7384757..7371c8f 100644 --- a/src/installer.ts +++ b/src/installer.ts @@ -15,7 +15,7 @@ export async function getMage(version: string): Promise { } const semver: string = release.tag_name.replace(/^v/, ''); - core.info(`✅ Mage version found: ${release.tag_name}`); + core.info(`Mage version found: ${release.tag_name}`); const filename: string = getFilename(semver); const downloadUrl: string = util.format( 'https://github.com/magefile/mage/releases/download/%s/%s', @@ -23,11 +23,11 @@ export async function getMage(version: string): Promise { filename ); - core.info(`⬇️ Downloading ${downloadUrl}...`); + core.info(`Downloading ${downloadUrl}...`); const downloadPath: string = await tc.downloadTool(downloadUrl); core.debug(`Downloaded to ${downloadPath}`); - core.info('📦 Extracting Mage...'); + core.info('Extracting Mage...'); let extPath: string; if (osPlat == 'win32') { extPath = await tc.extractZip(downloadPath); diff --git a/src/main.ts b/src/main.ts index 9e873a1..4c549f5 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,16 +6,13 @@ async function run(): Promise { try { const version = core.getInput('version') || 'latest'; const args = core.getInput('args'); - const workdir = core.getInput('workdir') || '.'; + const workdir = core.getInput('workdir') || process.env['GITHUB_WORKSPACE'] || '.'; const mage = await installer.getMage(version); - if (workdir && workdir !== '.') { - core.info(`📂 Using ${workdir} as working directory...`); - process.chdir(workdir); - } - - core.info('🏃 Running Mage...'); - await exec.exec(`${mage} ${args}`); + core.info('Running Mage...'); + await exec.exec(`${mage} ${args}`, undefined, { + cwd: workdir + }); } catch (error) { core.setFailed(error.message); }