Skip to content

Commit 9a3466a

Browse files
Aiqiao YanAiqiao Yan
authored andcommitted
Fix windows tests
1 parent 5112dc2 commit 9a3466a

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

packages/cache/__tests__/tar.test.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ test('zstd extract tar', async () => {
3838
? `${process.env['windir']}\\fakepath\\cache.tar`
3939
: 'cache.tar'
4040
const workspace = process.env['GITHUB_WORKSPACE']
41+
const tarPath = 'tar'
4142

4243
await tar.extractTar(archivePath, CompressionMethod.Zstd)
4344

4445
expect(mkdirMock).toHaveBeenCalledWith(workspace)
45-
const tarPath = IS_WINDOWS
46-
? `${process.env['windir']}\\System32\\tar.exe`
47-
: 'tar'
4846
expect(execMock).toHaveBeenCalledTimes(1)
4947
expect(execMock).toHaveBeenCalledWith(
5048
`"${tarPath}"`,
@@ -56,7 +54,7 @@ test('zstd extract tar', async () => {
5654
'-P',
5755
'-C',
5856
IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace
59-
],
57+
].concat(IS_WINDOWS ? ['--force-local'] : []),
6058
{cwd: undefined}
6159
)
6260
})
@@ -127,15 +125,12 @@ test('zstd create tar', async () => {
127125
const archiveFolder = getTempDir()
128126
const workspace = process.env['GITHUB_WORKSPACE']
129127
const sourceDirectories = ['~/.npm/cache', `${workspace}/dist`]
128+
const tarPath = 'tar'
130129

131130
await fs.promises.mkdir(archiveFolder, {recursive: true})
132131

133132
await tar.createTar(archiveFolder, sourceDirectories, CompressionMethod.Zstd)
134133

135-
const tarPath = IS_WINDOWS
136-
? `${process.env['windir']}\\System32\\tar.exe`
137-
: 'tar'
138-
139134
expect(execMock).toHaveBeenCalledTimes(1)
140135
expect(execMock).toHaveBeenCalledWith(
141136
`"${tarPath}"`,
@@ -149,7 +144,7 @@ test('zstd create tar', async () => {
149144
IS_WINDOWS ? workspace?.replace(/\\/g, '/') : workspace,
150145
'--files-from',
151146
'manifest.txt'
152-
],
147+
].concat(IS_WINDOWS ? ['--force-local'] : []),
153148
{
154149
cwd: archiveFolder
155150
}

0 commit comments

Comments
 (0)