actions
/
toolkit
mirror of https://github.com/actions/toolkit
1
0
Fork 0
Code

Fix failing test cases on windows

pull/1152/head
Lovepreet Singh 2022-08-17 08:21:09 +00:00
parent 6e888c882e
commit 98a4069558
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ test('zstd extract tar', async () => {
`"${defaultTarPath}"`, `"${defaultTarPath}"`,
[ [
'--use-compress-program', '--use-compress-program',
'unzstd --long=30', IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30',
'-xf', '-xf',
IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath,
'-P', '-P',
@ -140,7 +140,7 @@ test('zstd create tar', async () => {
[ [
'--posix', '--posix',
'--use-compress-program', '--use-compress-program',
'zstdmt --long=30', IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30',
'-cf', '-cf',
IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd, IS_WINDOWS ? CacheFilename.Zstd.replace(/\\/g, '/') : CacheFilename.Zstd,
'--exclude', '--exclude',
@ -210,7 +210,7 @@ test('zstd list tar', async () => {
`"${defaultTarPath}"`, `"${defaultTarPath}"`,
[ [
'--use-compress-program', '--use-compress-program',
'unzstd --long=30', IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30',
'-tf', '-tf',
IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath,
'-P' '-P'
@ -235,7 +235,7 @@ test('zstdWithoutLong list tar', async () => {
`"${defaultTarPath}"`, `"${defaultTarPath}"`,
[ [
'--use-compress-program', '--use-compress-program',
'unzstd', IS_WINDOWS ? 'zstd -d' : 'unzstd',
'-tf', '-tf',
IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath, IS_WINDOWS ? archivePath.replace(/\\/g, '/') : archivePath,
'-P' '-P'

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

@ -69,12 +69,12 @@ export async function extractTar(
switch (compressionMethod) { switch (compressionMethod) {
case CompressionMethod.Zstd: case CompressionMethod.Zstd:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -d --long=30'] return ['--use-compress-program', 'zstd -d --long=30']
} }
return ['--use-compress-program', 'unzstd --long=30'] return ['--use-compress-program', 'unzstd --long=30']
case CompressionMethod.ZstdWithoutLong: case CompressionMethod.ZstdWithoutLong:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -d'] return ['--use-compress-program', 'zstd -d']
} }
return ['--use-compress-program', 'unzstd'] return ['--use-compress-program', 'unzstd']
default: default:
@ -115,12 +115,12 @@ export async function createTar(
switch (compressionMethod) { switch (compressionMethod) {
case CompressionMethod.Zstd: case CompressionMethod.Zstd:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -T0 --long=30'] return ['--use-compress-program', 'zstd -T0 --long=30']
} }
return ['--use-compress-program', 'zstdmt --long=30'] return ['--use-compress-program', 'zstdmt --long=30']
case CompressionMethod.ZstdWithoutLong: case CompressionMethod.ZstdWithoutLong:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -T0'] return ['--use-compress-program', 'zstd -T0']
} }
return ['--use-compress-program', 'zstdmt'] return ['--use-compress-program', 'zstdmt']
default: default:
@ -156,12 +156,12 @@ export async function listTar(
switch (compressionMethod) { switch (compressionMethod) {
case CompressionMethod.Zstd: case CompressionMethod.Zstd:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -d --long=30'] return ['--use-compress-program', 'zstd -d --long=30']
} }
return ['--use-compress-program', 'unzstd --long=30'] return ['--use-compress-program', 'unzstd --long=30']
case CompressionMethod.ZstdWithoutLong: case CompressionMethod.ZstdWithoutLong:
if (process.platform === 'win32') { if (process.platform === 'win32') {
return ['--use-compress-program=zstd -d'] return ['--use-compress-program', 'zstd -d']
} }
return ['--use-compress-program', 'unzstd'] return ['--use-compress-program', 'unzstd']
default: default: