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

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

Merged
merged 7 commits into from
Jul 16, 2020
Merged

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

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bff9792
Try using pwsh instead of powershell
thboop Jul 15, 2020
6bcd10a
Merge pull request #1 from thboop/thboop/FixTool-Cache-unit-tests
thboop Jul 15, 2020
0465ed9
Create blank.yml
thboop Jul 15, 2020
bad1a52
Update blank.yml
thboop Jul 15, 2020
1fb58f6
Delete blank.yml
thboop Jul 15, 2020
327669c
Fallback to powershell
thboop Jul 16, 2020
ca8bdc3
Format files correctly
thboop Jul 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions packages/tool-cache/__tests__/tool-cache.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
const escapedZipFile = zipFile.replace(/'/g, "''")
const powershellPath = await io.which('powershell', true)
thboop marked this conversation as resolved.
Show resolved Hide resolved
const powershellPath =
(await io.which('pwsh', false)) ||
(await io.which('powershell', true))
const args = [
'-NoLogo',
'-Sta',
Expand Down Expand Up @@ -604,7 +606,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
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 = [
'-NoLogo',
'-Sta',
Expand Down Expand Up @@ -661,7 +665,9 @@ describe('@actions/tool-cache', function() {
if (IS_WINDOWS) {
const escapedStagingPath = stagingDir.replace(/'/g, "''") // double-up single quotes
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 = [
'-NoLogo',
'-Sta',
Expand Down