actions/toolkit
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/actions/toolkit synced 2025-08-22 12:59:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix tar tests

Browse Source
This commit is contained in:
Lovepreet Singh 2022-11-17 08:53:46 +00:00
parent 5f89653f1b
commit ea9856079f
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/cache/__tests__/tar.test.ts vendored
View File

@ -149,17 +149,17 @@ test('zstd create tar', async () => {
`"${tarPath}"`, `"${tarPath}"`,
[ [
'--posix', '--posix',
'--use-compress-program',
IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30',
'-cf',
IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd,
'--exclude', '--exclude',
IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd, IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd,
'-P', '-P',
'-C', '-C',
IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace, IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace,
'--files-from', '--files-from',
'manifest.txt' 'manifest.txt',
'--use-compress-program',
IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30',
'-cf',
IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd
] ]
.concat(IS_WINDOWS ? ['--force-local'] : []) .concat(IS_WINDOWS ? ['--force-local'] : [])
.concat(IS_MAC ? ['--delay-directory-restore'] : []), .concat(IS_MAC ? ['--delay-directory-restore'] : []),
@ -187,16 +187,16 @@ test('gzip create tar', async () => {
`"${tarPath}"`, `"${tarPath}"`,
[ [
'--posix', '--posix',
'-z',
'-cf',
IS_WINDOWS ? CacheFilename.Gzip.replace(/\\/g, '/') : CacheFilename.Gzip,
'--exclude', '--exclude',
IS_WINDOWS ? CacheFilename.Gzip.replace(/\\/g, '/') : CacheFilename.Gzip, IS_WINDOWS ? CacheFilename.Gzip.replace(/\\/g, '/') : CacheFilename.Gzip,
'-P', '-P',
'-C', '-C',
IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace, IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace,
'--files-from', '--files-from',
'manifest.txt' 'manifest.txt',
'-z',
'-cf',
IS_WINDOWS ? CacheFilename.Gzip.replace(/\\/g, '/') : CacheFilename.Gzip,
] ]
.concat(IS_WINDOWS ? ['--force-local'] : []) .concat(IS_WINDOWS ? ['--force-local'] : [])
.concat(IS_MAC ? ['--delay-directory-restore'] : []), .concat(IS_MAC ? ['--delay-directory-restore'] : []),
@ -281,3 +281,4 @@ test('gzip list tar', async () => {
{cwd: undefined} {cwd: undefined}
) )
}) })

8
packages/cache/src/internal/tar.ts vendored
View File

@ -69,13 +69,12 @@ async function getCompressionProgram(compressionMethod: CompressionMethod): Prom
return [ return [
'--use-compress-program', '--use-compress-program',
IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30', IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30',
'-tf'
] ]
case CompressionMethod.ZstdWithoutLong: case CompressionMethod.ZstdWithoutLong:
if (BSD_TAR_ZSTD) { if (BSD_TAR_ZSTD) {
return ['a'] // auto-detect compression return ['a'] // auto-detect compression
} }
return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd', '-tf'] return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd']
default: default:
return ['-z'] return ['-z']
} }
@ -87,6 +86,7 @@ export async function listTar(
): Promise<void> { ): Promise<void> {
const args = [ const args = [
...(await getCompressionProgram(compressionMethod)), ...(await getCompressionProgram(compressionMethod)),
'-tf',
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
'-P' '-P'
] ]
@ -101,8 +101,8 @@ export async function extractTar(
const workingDirectory = getWorkingDirectory() const workingDirectory = getWorkingDirectory()
await io.mkdirP(workingDirectory) await io.mkdirP(workingDirectory)
const args = [ const args = [
'-xf',
...(await getCompressionProgram(compressionMethod)), ...(await getCompressionProgram(compressionMethod)),
'-xf',
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
'-P', '-P',
'-C', '-C',
@ -153,7 +153,7 @@ export async function createTar(
} }
return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt', '-cf'] return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt', '-cf']
default: default:
return ['-z'] return ['-z', '-cf']
} }
} }
const args = [ const args = [