mirror of
https://github.com/actions/toolkit
synced 2025-05-09 00:22:56 +00:00
Fix gnutar check on windows
This commit is contained in:
parent
9366237c90
commit
0c58e4113e
2 changed files with 3 additions and 2 deletions
3
packages/cache/src/internal/cacheUtils.ts
vendored
3
packages/cache/src/internal/cacheUtils.ts
vendored
|
@ -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 {
|
||||
|
|
2
packages/cache/src/internal/tar.ts
vendored
2
packages/cache/src/internal/tar.ts
vendored
|
@ -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) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue