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

Fix tests

pull/1232/head
Sampark Sharma 2022-11-08 06:43:28 +00:00 committed by GitHub
parent 0c58e4113e
commit 62a66a8ce9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,9 +92,9 @@ test('gzip extract tar', async () => {
) )
}) })
test('gzip extract GNU tar on windows', async () => { test('gzip extract GNU tar on windows with GNUtar in path', async () => {
if (IS_WINDOWS) { if (IS_WINDOWS) {
jest.spyOn(fs, 'existsSync').mockReturnValueOnce(false) jest.spyOn(fs, 'existsSync').mockReturnValue(false)
const isGnuMock = jest const isGnuMock = jest
.spyOn(utils, 'isGnuTarInstalled') .spyOn(utils, 'isGnuTarInstalled')

4
packages/cache/src/internal/cacheUtils.ts vendored
View File

@ -119,7 +119,9 @@ export function getCacheFileName(compressionMethod: CompressionMethod): string {
export async function isGnuTarInstalled(): Promise<boolean> { export async function isGnuTarInstalled(): Promise<boolean> {
const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe` const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe`
const versionOutput = await getVersion('tar') const versionOutput = await getVersion('tar')
return versionOutput.toLowerCase().includes('gnu tar') || fs.existsSync(gnuTar) return (
versionOutput.toLowerCase().includes('gnu tar') || fs.existsSync(gnuTar)
)
} }
export function assertDefined<T>(name: string, value?: T): T { export function assertDefined<T>(name: string, value?: T): T {

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

@ -16,6 +16,7 @@ async function getTarPath(
const systemTar = `${process.env['windir']}\\System32\\tar.exe` const systemTar = `${process.env['windir']}\\System32\\tar.exe`
const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe` const gnuTar = `${process.env['windir']}\\Program Files\\Git\\usr\\bin\\tar.exe`
if (existsSync(gnuTar)) { if (existsSync(gnuTar)) {
// Making GNUtar + zstd as default on windows
args.push('--force-local') args.push('--force-local')
return gnuTar return gnuTar
} else if (compressionMethod !== CompressionMethod.Gzip) { } else if (compressionMethod !== CompressionMethod.Gzip) {