diff --git a/.github/workflows/cache-windows-test.yml b/.github/workflows/cache-windows-test.yml index c7f7a5a9..3868f296 100644 --- a/.github/workflows/cache-windows-test.yml +++ b/.github/workflows/cache-windows-test.yml @@ -78,7 +78,6 @@ jobs: run: | rm -rf test-cache rm -rf ~/test-cache - rm -f cache.tar - name: Restore cache using restoreCache() with Azure SDK run: | diff --git a/packages/cache/__tests__/tar.test.ts b/packages/cache/__tests__/tar.test.ts index a6a79a3d..a33f4fab 100644 --- a/packages/cache/__tests__/tar.test.ts +++ b/packages/cache/__tests__/tar.test.ts @@ -99,7 +99,7 @@ test('zstd extract tar with windows BSDtar', async () => { expect(execMock).toHaveBeenNthCalledWith( 1, [ - 'zstd -d --long=30 -o', + 'zstd -d --long=30 --force -o', TarFilename.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/') ].join(' '), @@ -273,7 +273,7 @@ test('zstd create tar with windows BSDtar', async () => { expect(execMock).toHaveBeenNthCalledWith( 2, [ - 'zstd -T0 --long=30 -o', + 'zstd -T0 --long=30 --force -o', CacheFilename.Zstd.replace(/\\/g, '/'), TarFilename.replace(/\\/g, '/') ].join(' '), @@ -370,7 +370,7 @@ test('zstd list tar with windows BSDtar', async () => { expect(execMock).toHaveBeenNthCalledWith( 1, [ - 'zstd -d --long=30 -o', + 'zstd -d --long=30 --force -o', TarFilename.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/') ].join(' '), diff --git a/packages/cache/src/cache.ts b/packages/cache/src/cache.ts index 2ebf44ca..f928a2b9 100644 --- a/packages/cache/src/cache.ts +++ b/packages/cache/src/cache.ts @@ -109,7 +109,7 @@ export async function restoreCache( return undefined } - core.debug( + core.info( "Couldn't find cache entry with zstd compression, falling back to gzip compression." ) } else { diff --git a/packages/cache/src/internal/tar.ts b/packages/cache/src/internal/tar.ts index 0da4e8df..0af6a87a 100644 --- a/packages/cache/src/internal/tar.ts +++ b/packages/cache/src/internal/tar.ts @@ -183,7 +183,7 @@ async function getDecompressionProgram( case CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ - 'zstd -d --long=30 -o', + 'zstd -d --long=30 --force -o', TarFilename, archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/') ] @@ -194,7 +194,7 @@ async function getDecompressionProgram( case CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ - 'zstd -d -o', + 'zstd -d --force -o', TarFilename, archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/') ] @@ -223,7 +223,7 @@ async function getCompressionProgram( case CompressionMethod.Zstd: return BSD_TAR_ZSTD ? [ - 'zstd -T0 --long=30 -o', + 'zstd -T0 --long=30 --force -o', cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), TarFilename ] @@ -234,7 +234,7 @@ async function getCompressionProgram( case CompressionMethod.ZstdWithoutLong: return BSD_TAR_ZSTD ? [ - 'zstd -T0 -o', + 'zstd -T0 --force -o', cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), TarFilename ]