Fix gnutar check on windows

CareerJSM · Nov 7, 2022 · 0c58e41 · 0c58e41
1 parent 9366237
commit 0c58e41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/packages/cache/src/internal/cacheUtils.ts b/packages/cache/src/internal/cacheUtils.ts
@@ -117,8 +117,9 @@ export function getCacheFileName(compressionMethod: CompressionMethod): string {
 }
 
 export async function isGnuTarInstalled(): Promise<boolean> {
+  const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe`
   const versionOutput = await getVersion('tar')
-  return versionOutput.toLowerCase().includes('gnu tar')
+  return versionOutput.toLowerCase().includes('gnu tar') || fs.existsSync(gnuTar)
 }
 
 export function assertDefined<T>(name: string, value?: T): T {

diff --git a/packages/cache/src/internal/tar.ts b/packages/cache/src/internal/tar.ts
@@ -15,7 +15,7 @@ async function getTarPath(
     case 'win32': {
       const systemTar = `${process.env['windir']}\\System32\\tar.exe`
       const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe`
-      if (compressionMethod !== CompressionMethod.Gzip && existsSync(gnuTar)) {
+      if (existsSync(gnuTar)) {
         args.push('--force-local')
         return gnuTar
       } else if (compressionMethod !== CompressionMethod.Gzip) {