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

Address review comments

Browse Source
This commit is contained in:
Sampark Sharma 2022-11-15 10:18:46 +00:00 committed by GitHub
parent 5a0405df4e
commit 9443e26349
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cache/src/internal/constants.ts vendored
View File

@ -23,4 +23,4 @@ export const DefaultRetryDelay = 5000
export const SocketTimeout = 5000
// The default path of GNUtar on hosted Windows runners
export const GnuTarPathOnWindows = 'C:\\Program Files\\Git\\usr\\bin\\tar.exe'
export const GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`

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

@ -8,7 +8,6 @@ import {CompressionMethod} from './constants'
const IS_WINDOWS = process.platform === 'win32'
async function getTarPath(args: string[]): Promise<string> {
let tarPath = await io.which('tar', true)
switch (process.platform) {
case 'win32': {
const gnuTar = await utils.getGnuTarPathOnWindows()
@ -16,9 +15,9 @@ async function getTarPath(args: string[]): Promise<string> {
if (gnuTar) {
// Use GNUtar as default on windows
args.push('--force-local')
tarPath = gnuTar
return gnuTar
} else if (existsSync(systemTar)) {
tarPath = systemTar
return systemTar
}
break
}
@ -27,23 +26,19 @@ async function getTarPath(args: string[]): Promise<string> {
if (gnuTar) {
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
args.push('--delay-directory-restore')
tarPath = gnuTar
return gnuTar
}
break
}
default:
break
}
return tarPath
return await io.which('tar', true)
}
async function execTar(
args: string[],
compressionMethod: CompressionMethod,
cwd?: string
): Promise<void> {
async function execTar(args: string[], cwd?: string): Promise<void> {
try {
await exec(`"${await getTarPath(args, compressionMethod)}"`, args, {cwd})
await exec(`"${await getTarPath(args)}"`, args, {cwd})
} catch (error) {
throw new Error(`Tar failed with error: ${error?.message}`)
}
@ -82,7 +77,7 @@ export async function listTar(
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
'-P'
]
await execTar(args, compressionMethod)
await execTar(args)
}
export async function extractTar(
@ -100,7 +95,7 @@ export async function extractTar(
'-C',
workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
]
await execTar(args, compressionMethod)
await execTar(args)
}
export async function createTar(
@ -148,5 +143,5 @@ export async function createTar(
'--files-from',
manifestFilename
]
await execTar(args, compressionMethod, archiveFolder)
await execTar(args, archiveFolder)
}