Skip to content

Bugfix: Fix issue with interactive unzip on Linux #807

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
luketomlinson merged 16 commits into from
May 21, 2021
+175 −66
Merged

Bugfix: Fix issue with interactive unzip on Linux #807

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0911ed2
Add new powershell commands for windows unzip
luketomlinson May 12, 2021
ce08409
Test fails to overwrite file
luketomlinson May 12, 2021
008211e
Add new windows commands for unzip
luketomlinson May 12, 2021
495c529
Add Test for failing case for both pwsh and powershell
luketomlinson May 13, 2021
b31bbe5
Modify test to confirm overwrite behavior for xar
luketomlinson May 14, 2021
8684339
Delete ._test.txt
luketomlinson May 14, 2021
62eb9f8
Add fallback case for older windows systems
luketomlinson May 18, 2021
72970bf
Remove try
luketomlinson May 18, 2021
e5db96a
Run Tests on windows-2016
luketomlinson May 19, 2021
0195ec2
Update tar tests to handle existing files
luketomlinson May 19, 2021
533ca19
Lint
luketomlinson May 19, 2021
a00d1ad
Update tool-cache.test.ts
luketomlinson May 19, 2021
3b56477
Update tool-cache.test.ts
luketomlinson May 19, 2021
58ac2ac
Update tool-cache.test.ts
luketomlinson May 19, 2021
b88c5cf
Update tool-cache.test.ts
luketomlinson May 19, 2021
aebc03c
Update from PR feedback
luketomlinson May 21, 2021
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
Update tool-cache.test.ts
  • Loading branch information
@luketomlinson
luketomlinson committed May 19, 2021
commit a00d1ad97a3a98ac4e2ba859751cb9023a668211
21 changes: 17 additions & 4 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 @@ -492,12 +492,19 @@ describe('@actions/tool-cache', function() {
const _tgzFile: string = path.join(tempDir, 'test.tar.gz')
await io.cp(path.join(__dirname, 'data', 'test.tar.gz'), _tgzFile)


//Create file to overwrite
const destDir = path.join(__dirname, 'extract-dest')
await io.rmRF(destDir)
await io.mkdirP(destDir)
fs.writeFileSync(path.join(destDir, 'file.txt'), 'overwriteMe')


// extract/cache
const extPath: string = await tc.extractTar(_tgzFile)
const extPath: string = await tc.extractTar(_tgzFile, destDir)
await tc.cacheDir(extPath, 'my-tgz-contents', '1.1.0')
const toolPath: string = tc.find('my-tgz-contents', '1.1.0')

fs.writeFileSync(path.join(tempDir, 'file.txt'), 'overwriteMe')

expect(fs.existsSync(toolPath)).toBeTruthy()
expect(fs.existsSync(`${toolPath}.complete`)).toBeTruthy()
Expand Down Expand Up @@ -525,7 +532,7 @@ describe('@actions/tool-cache', function() {
// copy the .tar.gz file to the test dir
const _tgzFile: string = path.join(tempDir, 'test.tar.gz')
await io.cp(path.join(__dirname, 'data', 'test.tar.gz'), _tgzFile)
fs.writeFileSync(path.join(tempDir, 'file.txt'), 'overwriteMe')
fs.writeFileSync(path.join(destDir, 'file.txt'), 'overwriteMe')

// extract/cache
const extPath: string = await tc.extractTar(_tgzFile, destDir)
Expand Down Expand Up @@ -559,8 +566,14 @@ describe('@actions/tool-cache', function() {
const _txzFile: string = path.join(tempDir, 'test.tar.xz')
await io.cp(path.join(__dirname, 'data', 'test.tar.xz'), _txzFile)

//Create file to overwrite
const destDir = path.join(__dirname, 'extract-dest')
await io.rmRF(destDir)
await io.mkdirP(destDir)
fs.writeFileSync(path.join(destDir, 'file.txt'), 'overwriteMe')

// extract/cache
const extPath: string = await tc.extractTar(_txzFile, undefined, 'x')
const extPath: string = await tc.extractTar(_txzFile, destDir, 'x')
await tc.cacheDir(extPath, 'my-txz-contents', '1.1.0')
const toolPath: string = tc.find('my-txz-contents', '1.1.0')

Expand Down