actions/toolkit
1
0
Fork 0
mirror of https://github.com/actions/toolkit synced 2025-05-10 00:53:10 +00:00
Code Activity

Fix Issue where we can no longer create zip files on windows during cli tests. (#520)

Browse source 
* Try using pwsh instead of powershell
* Fallback to powershell
* Format files correctly
This commit is contained in:
Thomas Boop 2020-07-16 11:51:00 -04:00 • committed by GitHub
parent 2710592b73
commit 32f15666bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/tool-cache/__tests__/tool-cache.test.ts
View file

@ -553,7 +553,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) { if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
const escapedZipFile = zipFile.replace(/'/g, "''") const escapedZipFile = zipFile.replace(/'/g, "''")
const powershellPath = await io.which('powershell', true) const powershellPath =
(await io.which('pwsh', false)) ||
(await io.which('powershell', true))
const args = [ const args = [
'-NoLogo', '-NoLogo',
'-Sta', '-Sta',
@ -604,7 +606,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) { if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
const escapedZipFile = zipFile.replace(/'/g, "''") const escapedZipFile = zipFile.replace(/'/g, "''")
const powershellPath = await io.which('powershell', true) const powershellPath =
(await io.which('pwsh', false)) ||
(await io.which('powershell', true))
const args = [ const args = [
'-NoLogo', '-NoLogo',
'-Sta', '-Sta',
@ -661,7 +665,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) { if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
const escapedZipFile = zipFile.replace(/'/g, "''") const escapedZipFile = zipFile.replace(/'/g, "''")
const powershellPath = await io.which('powershell', true) const powershellPath =
(await io.which('pwsh', false)) ||
(await io.which('powershell', true))
const args = [ const args = [
'-NoLogo', '-NoLogo',
'-Sta', '-Sta',