actions/toolkit
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/actions/toolkit synced 2026-03-15 15:52:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Check if tool path exists before executing (#385)

Browse Source
This commit is contained in:
Reinier Timmer
2020-04-28 16:36:49 +02:00
committed by GitHub
parent 1e88dec883
commit 34f71e80ce
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/tool-cache/__tests__/tool-cache.test.ts
View File

@@ -461,7 +461,7 @@ describe('@actions/tool-cache', function() {
]
await exec.exec(`"${powershellPath}"`, args)
} else {
const zipPath: string = await io.which('zip')
const zipPath: string = await io.which('zip', true)
await exec.exec(`"${zipPath}`, [zipFile, '-r', '.'], {cwd: stagingDir})
}
@@ -512,7 +512,7 @@ describe('@actions/tool-cache', function() {
]
await exec.exec(`"${powershellPath}"`, args)
} else {
const zipPath: string = await io.which('zip')
const zipPath: string = await io.which('zip', true)
await exec.exec(zipPath, [zipFile, '-r', '.'], {cwd: stagingDir})
}
@@ -569,7 +569,7 @@ describe('@actions/tool-cache', function() {
]
await exec.exec(`"${powershellPath}"`, args)
} else {
const zipPath: string = await io.which('zip')
const zipPath: string = await io.which('zip', true)
await exec.exec(zipPath, [zipFile, '-r', '.'], {cwd: stagingDir})
}

4
packages/tool-cache/src/tool-cache.ts
View File

@@ -279,7 +279,7 @@ async function extractZipWin(file: string, dest: string): Promise<void> {
const command = `$ErrorActionPreference = 'Stop' ; try { Add-Type -AssemblyName System.IO.Compression.FileSystem } catch { } ; [System.IO.Compression.ZipFile]::ExtractToDirectory('${escapedFile}', '${escapedDest}')`
// run powershell
const powershellPath = await io.which('powershell')
const powershellPath = await io.which('powershell', true)
const args = [
'-NoLogo',
'-Sta',
@@ -294,7 +294,7 @@ async function extractZipWin(file: string, dest: string): Promise<void> {
}
async function extractZipNix(file: string, dest: string): Promise<void> {
const unzipPath = await io.which('unzip')
const unzipPath = await io.which('unzip', true)
await exec(`"${unzipPath}"`, [file], {cwd: dest})
}