_

Signed-off-by: Sora Morimoto <[email protected]>
actions · Jul 23, 2024 · 64ed6af · 64ed6af
1 parent 31a8a1a
commit 64ed6af
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 31 deletions.
diff --git a/packages/cache/__tests__/tar.test.ts b/packages/cache/__tests__/tar.test.ts
@@ -71,10 +71,7 @@ test('zstd extract tar', async () => {
     ]
       .concat(IS_WINDOWS ? ['--force-local'] : [])
       .concat(IS_MAC ? ['--delay-directory-restore'] : [])
-      .concat([
-        '--use-compress-program',
-        IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
-      ])
+      .concat(['--use-compress-program', 'zstd -d --long=30'])
       .join(' '),
     undefined,
     {
@@ -231,10 +228,7 @@ test('zstd create tar', async () => {
     ]
       .concat(IS_WINDOWS ? ['--force-local'] : [])
       .concat(IS_MAC ? ['--delay-directory-restore'] : [])
-      .concat([
-        '--use-compress-program',
-        IS_WINDOWS ? '"zstd -T0 --adapt --long=30"' : 'zstdmt --adapt --long=30'
-      ])
+      .concat(['--use-compress-program', 'zstd -T0 --adapt --long=30'])
       .join(' '),
     undefined, // args
     {
@@ -365,10 +359,7 @@ test('zstd list tar', async () => {
     ]
       .concat(IS_WINDOWS ? ['--force-local'] : [])
       .concat(IS_MAC ? ['--delay-directory-restore'] : [])
-      .concat([
-        '--use-compress-program',
-        IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
-      ])
+      .concat(['--use-compress-program', 'zstd -d --long=30'])
       .join(' '),
     undefined,
     {
@@ -442,7 +433,7 @@ test('zstdWithoutLong list tar', async () => {
     ]
       .concat(IS_WINDOWS ? ['--force-local'] : [])
       .concat(IS_MAC ? ['--delay-directory-restore'] : [])
-      .concat(['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'])
+      .concat(['--use-compress-program', 'zstd -d'])
       .join(' '),
     undefined,
     {

diff --git a/packages/cache/src/internal/tar.ts b/packages/cache/src/internal/tar.ts
@@ -172,7 +172,6 @@ async function getDecompressionProgram(
   archivePath: string
 ): Promise<string[]> {
   // -d: Decompress.
-  // unzstd is equivalent to 'zstd -d'
   // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
   // Using 30 here because we also support 32-bit self-hosted runners.
   const BSD_TAR_ZSTD =
@@ -187,26 +186,22 @@ async function getDecompressionProgram(
             TarFilename,
             archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
           ]
-        : [
-            '--use-compress-program',
-            IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
-          ]
+        : ['--use-compress-program', 'zstd -d --long=30']
     case CompressionMethod.ZstdWithoutLong:
       return BSD_TAR_ZSTD
         ? [
             'zstd -d --force -o',
             TarFilename,
             archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
           ]
-        : ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd']
+        : ['--use-compress-program', 'zstd -d']
     default:
       return ['-z']
   }
 }
 
 // Used for creating the archive
 // -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
-// zstdmt is equivalent to 'zstd -T0'
 // --adapt: Dynamically adapt compression level to I/O conditions.
 // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
 // Using 30 here because we also support 32-bit self-hosted runners.
@@ -228,31 +223,23 @@ async function getCompressionProgram(
             cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
             TarFilename
           ]
-        : [
-            '--use-compress-program',
-            IS_WINDOWS
-              ? '"zstd -T0 --adapt --long=30"'
-              : 'zstdmt --adapt --long=30'
-          ]
+        : ['--use-compress-program', 'zstd -T0 --adapt --long=30']
     case CompressionMethod.ZstdWithoutAdapt:
       return BSD_TAR_ZSTD
         ? [
             'zstd -T0 --long=30 --force -o',
             cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
             TarFilename
           ]
-        : [
-            '--use-compress-program',
-            IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
-          ]
+        : ['--use-compress-program', 'zstd -T0 --long=30']
     case CompressionMethod.ZstdWithoutLong:
       return BSD_TAR_ZSTD
         ? [
             'zstd -T0 --force -o',
             cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
             TarFilename
           ]
-        : ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt']
+        : ['--use-compress-program', 'zstd -T0']
     default:
       return ['-z']
   }