Skip to content

Add tool-cache #12

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

Merged
damccorm merged 21 commits into from
Jun 6, 2019
Merged

Add tool-cache #12

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
20bb325
Add tool-cache
May 28, 2019
044ccbe
Format
May 28, 2019
9ca4353
Fix linux bug
May 28, 2019
2c78503
Update readme
May 28, 2019
21da019
Package zip/unzip
May 29, 2019
911e847
Merge branch 'features/tool-cache' of https://github.com/actions/tool…
May 29, 2019
87cf56d
Reorganize
May 29, 2019
7e6cc16
Format
May 29, 2019
f27fda8
unzip somehow got corrupted, fixing
May 29, 2019
a08760e
Resolve remaining todos
Jun 4, 2019
eb02e1f
Don't log everything
Jun 4, 2019
17167af
Pass error codes
Jun 4, 2019
d994756
linting
Jun 4, 2019
e3cbf7b
Branding and nits
Jun 5, 2019
1ad4b89
Fix for mac
Jun 5, 2019
2d58290
clean up windows/nix logic
Jun 5, 2019
950b8a8
Clean up tests
Jun 5, 2019
4f35290
Export HTTPError
Jun 5, 2019
020aa68
Add option for custom 7z tool
Jun 5, 2019
6e5e3c3
Lint/format
Jun 5, 2019
2e8d81f
Dont wipe temp/tool directories
Jun 5, 2019
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
Prev Previous commit
Next Next commit
clean up windows/nix logic
  • Loading branch information
Danny McCormick committed Jun 5, 2019
commit 2d58290b81ab579c52f132314ee5e481abe4a816
54 changes: 28 additions & 26 deletions packages/tool-cache/src/tool-cache.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,38 +188,40 @@ export async function extractZip(file: string, dest?: string): Promise<string> {
dest = dest || (await _createExtractFolder(dest))

if (IS_WINDOWS) {
Copy link
Contributor

@jclem jclem Jun 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should introduce a pattern for OS splitting—rather than this IS_WINDOWS branch, does it make sense to do something like:

IS_WINDOWS ? extractZipWin() : extractZipNix()

Do you think this would improve readabilty of these branches?

Copy link
Contributor Author

@damccorm damccorm Jun 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like it here, not sure how useful I see it being in other places - I think most of these splits are pretty small amounts of code compared to this one.

I also ditched the ? : syntax in favor of traditional if else because it felt a little crowded with the awaits thrown in.

// build the powershell command
const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, '') // double-up single quotes, remove double quotes and newlines
const escapedDest = dest.replace(/'/g, "''").replace(/"|\n|\r/g, '')
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 args = [
'-NoLogo',
'-Sta',
'-NoProfile',
'-NonInteractive',
'-ExecutionPolicy',
'Unrestricted',
'-Command',
command
]
await exec(`"${powershellPath}"`, args)
await extractZipWin(file, dest)
} else {
const unzipPath = path.join(
__dirname,
'..',
'scripts',
'externals',
'unzip'
)
await exec(`"${unzipPath}"`, [file], {cwd: dest})
await extractZipNix(file, dest)
}

return dest
}

async function extractZipWin(file: string, dest: string): Promise<void> {
// build the powershell command
const escapedFile = file.replace(/'/g, "''").replace(/"|\n|\r/g, '') // double-up single quotes, remove double quotes and newlines
const escapedDest = dest.replace(/'/g, "''").replace(/"|\n|\r/g, '')
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 args = [
'-NoLogo',
'-Sta',
'-NoProfile',
'-NonInteractive',
'-ExecutionPolicy',
'Unrestricted',
'-Command',
command
]
await exec(`"${powershellPath}"`, args)
}

async function extractZipNix(file: string, dest: string): Promise<void> {
const unzipPath = path.join(__dirname, '..', 'scripts', 'externals', 'unzip')
await exec(`"${unzipPath}"`, [file], {cwd: dest})
}

/**
* Caches a directory and installs it into the tool cacheDir
*
Expand Down