Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Exec: throw error when cwd option does not exist #793

Merged
merged 2 commits into from May 7, 2021
Merged

Exec: throw error when cwd option does not exist #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae2eb2e
Exec: throw error when cwd option does not exist
luketomlinson May 6, 2021
c0f1ad9
Simplify promise rejection
luketomlinson May 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions packages/exec/__tests__/exec.test.ts
View file
Open in desktop
Expand Up @@ -538,6 +538,22 @@ describe('@actions/exec', () => {
expect(output.trim()).toBe(`args[0]: "hello"${os.EOL}args[1]: "world"`)
})

it('Exec roots throws friendly error when bad cwd is specified', async () => {
const execOptions = getExecOptions()
execOptions.cwd = 'nonexistent/path'

await expect(exec.exec('ls', ['-all'], execOptions)).rejects.toThrowError(
`The cwd: ${execOptions.cwd} does not exist!`
)
})

it('Exec roots does not throw when valid cwd is provided', async () => {
const execOptions = getExecOptions()
execOptions.cwd = './'

await expect(exec.exec('ls', ['-all'], execOptions)).resolves.toBe(0)
})

it('Exec roots relative tool path using rooted options.cwd', async () => {
let command: string
if (IS_WINDOWS) {
Expand Down
6 changes: 5 additions & 1 deletion packages/exec/src/toolrunner.ts
View file
Open in desktop
Expand Up @@ -414,7 +414,7 @@ export class ToolRunner extends events.EventEmitter {
// otherwise verify it exists (add extension on Windows if necessary)
this.toolPath = await io.which(this.toolPath, true)

return new Promise<number>((resolve, reject) => {
return new Promise<number>(async (resolve, reject) => {
this._debug(`exec tool: ${this.toolPath}`)
this._debug('arguments:')
for (const arg of this.args) {
Expand All @@ -433,6 +433,10 @@ export class ToolRunner extends events.EventEmitter {
this._debug(message)
})

if (this.options.cwd && !(await ioUtil.exists(this.options.cwd))) {
return reject(new Error(`The cwd: ${this.options.cwd} does not exist!`))
}

const fileName = this._getSpawnFileName()
const cp = child.spawn(
fileName,
Expand Down