diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js
index cf72416..2de1cd7 100644
--- a/dist/restore-only/index.js
+++ b/dist/restore-only/index.js
@@ -1177,6 +1177,10 @@ function getVersion(app) {
// Use zstandard if possible to maximize cache performance
function getCompressionMethod() {
return __awaiter(this, void 0, void 0, function* () {
+ if (process.platform === 'win32' && !(yield isGnuTarInstalled())) {
+ // Disable zstd due to bug https://github.com/actions/cache/issues/301
+ return constants_1.CompressionMethod.Gzip;
+ }
const versionOutput = yield getVersion('zstd');
const version = semver.clean(versionOutput);
if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
@@ -1200,16 +1204,13 @@ function getCacheFileName(compressionMethod) {
: constants_1.CacheFilename.Zstd;
}
exports.getCacheFileName = getCacheFileName;
-function getGnuTarPathOnWindows() {
+function isGnuTarInstalled() {
return __awaiter(this, void 0, void 0, function* () {
- if (fs.existsSync(constants_1.GnuTarPathOnWindows)) {
- return constants_1.GnuTarPathOnWindows;
- }
const versionOutput = yield getVersion('tar');
- return versionOutput.toLowerCase().includes('gnu tar') ? io.which('tar') : '';
+ return versionOutput.toLowerCase().includes('gnu tar');
});
}
-exports.getGnuTarPathOnWindows = getGnuTarPathOnWindows;
+exports.isGnuTarInstalled = isGnuTarInstalled;
function assertDefined(name, value) {
if (value === undefined) {
throw Error(`Expected ${name} but value was undefiend`);
@@ -3432,7 +3433,6 @@ function getCacheEntry(keys, paths, options) {
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
if (response.statusCode === 204) {
- // Cache not found
return null;
}
if (!requestUtils_1.isSuccessStatusCode(response.statusCode)) {
@@ -3441,7 +3441,6 @@ function getCacheEntry(keys, paths, options) {
const cacheResult = response.result;
const cacheDownloadUrl = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.archiveLocation;
if (!cacheDownloadUrl) {
- // Cache achiveLocation not found. This should never happen, and hence bail out.
throw new Error('Cache not found.');
}
core.setSecret(cacheDownloadUrl);
@@ -38203,19 +38202,21 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const constants_1 = __webpack_require__(931);
const IS_WINDOWS = process.platform === 'win32';
-// Returns tar path and type: BSD or GNU
-function getTarPath() {
+function getTarPath(args, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
switch (process.platform) {
case 'win32': {
- const gnuTar = yield utils.getGnuTarPathOnWindows();
- const systemTar = constants_1.SystemTarPathOnWindows;
- if (gnuTar) {
- // Use GNUtar as default on windows
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
+ const systemTar = `${process.env['windir']}\\System32\\tar.exe`;
+ if (compressionMethod !== constants_1.CompressionMethod.Gzip) {
+ // We only use zstandard compression on windows when gnu tar is installed due to
+ // a bug with compressing large files with bsdtar + zstd
+ args.push('--force-local');
}
else if (fs_1.existsSync(systemTar)) {
- return { path: systemTar, type: constants_1.ArchiveToolType.BSD };
+ return systemTar;
+ }
+ else if (yield utils.isGnuTarInstalled()) {
+ args.push('--force-local');
}
break;
}
@@ -38223,92 +38224,25 @@ function getTarPath() {
const gnuTar = yield io.which('gtar', false);
if (gnuTar) {
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
- }
- else {
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.BSD
- };
+ args.push('--delay-directory-restore');
+ return gnuTar;
}
+ break;
}
default:
break;
}
- // Default assumption is GNU tar is present in path
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.GNU
- };
+ return yield io.which('tar', true);
});
}
-// Return arguments for tar as per tarPath, compressionMethod, method type and os
-function getTarArgs(tarPath, compressionMethod, type, archivePath = '') {
+function execTar(args, compressionMethod, cwd) {
return __awaiter(this, void 0, void 0, function* () {
- const args = [`"${tarPath.path}"`];
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const tarFile = 'cache.tar';
- const workingDirectory = getWorkingDirectory();
- // Speficic args for BSD tar on windows for workaround
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- // Method specific args
- switch (type) {
- case 'create':
- args.push('--posix', '-cf', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--exclude', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--files-from', constants_1.ManifestFilename);
- break;
- case 'extract':
- args.push('-xf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'));
- break;
- case 'list':
- args.push('-tf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P');
- break;
+ try {
+ yield exec_1.exec(`"${yield getTarPath(args, compressionMethod)}"`, args, { cwd });
}
- // Platform specific args
- if (tarPath.type === constants_1.ArchiveToolType.GNU) {
- switch (process.platform) {
- case 'win32':
- args.push('--force-local');
- break;
- case 'darwin':
- args.push('--delay-directory-restore');
- break;
- }
+ catch (error) {
+ throw new Error(`Tar failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
}
- return args;
- });
-}
-// Returns commands to run tar and compression program
-function getCommands(compressionMethod, type, archivePath = '') {
- return __awaiter(this, void 0, void 0, function* () {
- let args;
- const tarPath = yield getTarPath();
- const tarArgs = yield getTarArgs(tarPath, compressionMethod, type, archivePath);
- const compressionArgs = type !== 'create'
- ? yield getDecompressionProgram(tarPath, compressionMethod, archivePath)
- : yield getCompressionProgram(tarPath, compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- if (BSD_TAR_ZSTD && type !== 'create') {
- args = [[...compressionArgs].join(' '), [...tarArgs].join(' ')];
- }
- else {
- args = [[...tarArgs].join(' '), [...compressionArgs].join(' ')];
- }
- if (BSD_TAR_ZSTD) {
- return args;
- }
- return [args.join(' ')];
});
}
function getWorkingDirectory() {
@@ -38316,116 +38250,91 @@ function getWorkingDirectory() {
return (_a = process.env['GITHUB_WORKSPACE']) !== null && _a !== void 0 ? _a : process.cwd();
}
// Common function for extractTar and listTar to get the compression method
-function getDecompressionProgram(tarPath, compressionMethod, archivePath) {
- return __awaiter(this, void 0, void 0, function* () {
- // -d: Decompress.
- // unzstd is equivalent to 'zstd -d'
- // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
- // Using 30 here because we also support 32-bit self-hosted runners.
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d --long=30 -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'];
- default:
- return ['-z'];
- }
- });
+function getCompressionProgram(compressionMethod) {
+ // -d: Decompress.
+ // unzstd is equivalent to 'zstd -d'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd'];
+ default:
+ return ['-z'];
+ }
}
-// Used for creating the archive
-// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
-// zstdmt is equivalent to 'zstd -T0'
-// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
-// Using 30 here because we also support 32-bit self-hosted runners.
-// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
-function getCompressionProgram(tarPath, compressionMethod) {
- return __awaiter(this, void 0, void 0, function* () {
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 --long=30 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt'];
- default:
- return ['-z'];
- }
- });
-}
-// Executes all commands as separate processes
-function execCommands(commands, cwd) {
- return __awaiter(this, void 0, void 0, function* () {
- for (const command of commands) {
- try {
- yield exec_1.exec(command, undefined, { cwd });
- }
- catch (error) {
- throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
- }
- }
- });
-}
-// List the contents of a tar
function listTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
- const commands = yield getCommands(compressionMethod, 'list', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-tf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P'
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.listTar = listTar;
-// Extract a tar
function extractTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Create directory to extract tar into
const workingDirectory = getWorkingDirectory();
yield io.mkdirP(workingDirectory);
- const commands = yield getCommands(compressionMethod, 'extract', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-xf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.extractTar = extractTar;
-// Create a tar
function createTar(archiveFolder, sourceDirectories, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Write source directories to manifest.txt to avoid command length limits
- fs_1.writeFileSync(path.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join('\n'));
- const commands = yield getCommands(compressionMethod, 'create');
- yield execCommands(commands, archiveFolder);
+ const manifestFilename = 'manifest.txt';
+ const cacheFileName = utils.getCacheFileName(compressionMethod);
+ fs_1.writeFileSync(path.join(archiveFolder, manifestFilename), sourceDirectories.join('\n'));
+ const workingDirectory = getWorkingDirectory();
+ // -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
+ // zstdmt is equivalent to 'zstd -T0'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ // Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
+ function getCompressionProgram() {
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt'];
+ default:
+ return ['-z'];
+ }
+ }
+ const args = [
+ '--posix',
+ ...getCompressionProgram(),
+ '-cf',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--exclude',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--files-from',
+ manifestFilename
+ ];
+ yield execTar(args, compressionMethod, archiveFolder);
});
}
exports.createTar = createTar;
@@ -47175,7 +47084,6 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const cacheHttpClient = __importStar(__webpack_require__(114));
const tar_1 = __webpack_require__(434);
-const constants_1 = __webpack_require__(931);
class ValidationError extends Error {
constructor(message) {
super(message);
@@ -47237,31 +47145,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
for (const key of keys) {
checkKey(key);
}
- let cacheEntry;
- let compressionMethod = yield utils.getCompressionMethod();
+ const compressionMethod = yield utils.getCompressionMethod();
let archivePath = '';
try {
// path are needed to compute version
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
+ const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
compressionMethod
});
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- // This is to support the old cache entry created by gzip on windows.
- if (process.platform === 'win32' &&
- compressionMethod !== constants_1.CompressionMethod.Gzip) {
- compressionMethod = constants_1.CompressionMethod.Gzip;
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
- compressionMethod
- });
- if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- return undefined;
- }
- core.debug("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
- }
- else {
- // Cache not found
- return undefined;
- }
+ // Cache not found
+ return undefined;
}
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
core.debug(`Archive Path: ${archivePath}`);
@@ -53342,11 +53235,6 @@ var CompressionMethod;
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
-var ArchiveToolType;
-(function (ArchiveToolType) {
- ArchiveToolType["GNU"] = "gnu";
- ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
@@ -53355,12 +53243,6 @@ exports.DefaultRetryDelay = 5000;
// over the socket during this period, the socket is destroyed and the download
// is aborted.
exports.SocketTimeout = 5000;
-// The default path of GNUtar on hosted Windows runners
-exports.GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`;
-// The default path of BSDtar on hosted Windows runners
-exports.SystemTarPathOnWindows = `${process.env['SYSTEMDRIVE']}\\Windows\\System32\\tar.exe`;
-exports.TarFilename = 'cache.tar';
-exports.ManifestFilename = 'manifest.txt';
//# sourceMappingURL=constants.js.map
/***/ }),
diff --git a/dist/restore/index.js b/dist/restore/index.js
index 5d3a662..076b17e 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -1177,6 +1177,10 @@ function getVersion(app) {
// Use zstandard if possible to maximize cache performance
function getCompressionMethod() {
return __awaiter(this, void 0, void 0, function* () {
+ if (process.platform === 'win32' && !(yield isGnuTarInstalled())) {
+ // Disable zstd due to bug https://github.com/actions/cache/issues/301
+ return constants_1.CompressionMethod.Gzip;
+ }
const versionOutput = yield getVersion('zstd');
const version = semver.clean(versionOutput);
if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
@@ -1200,16 +1204,13 @@ function getCacheFileName(compressionMethod) {
: constants_1.CacheFilename.Zstd;
}
exports.getCacheFileName = getCacheFileName;
-function getGnuTarPathOnWindows() {
+function isGnuTarInstalled() {
return __awaiter(this, void 0, void 0, function* () {
- if (fs.existsSync(constants_1.GnuTarPathOnWindows)) {
- return constants_1.GnuTarPathOnWindows;
- }
const versionOutput = yield getVersion('tar');
- return versionOutput.toLowerCase().includes('gnu tar') ? io.which('tar') : '';
+ return versionOutput.toLowerCase().includes('gnu tar');
});
}
-exports.getGnuTarPathOnWindows = getGnuTarPathOnWindows;
+exports.isGnuTarInstalled = isGnuTarInstalled;
function assertDefined(name, value) {
if (value === undefined) {
throw Error(`Expected ${name} but value was undefiend`);
@@ -3432,7 +3433,6 @@ function getCacheEntry(keys, paths, options) {
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
if (response.statusCode === 204) {
- // Cache not found
return null;
}
if (!requestUtils_1.isSuccessStatusCode(response.statusCode)) {
@@ -3441,7 +3441,6 @@ function getCacheEntry(keys, paths, options) {
const cacheResult = response.result;
const cacheDownloadUrl = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.archiveLocation;
if (!cacheDownloadUrl) {
- // Cache achiveLocation not found. This should never happen, and hence bail out.
throw new Error('Cache not found.');
}
core.setSecret(cacheDownloadUrl);
@@ -38116,19 +38115,21 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const constants_1 = __webpack_require__(931);
const IS_WINDOWS = process.platform === 'win32';
-// Returns tar path and type: BSD or GNU
-function getTarPath() {
+function getTarPath(args, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
switch (process.platform) {
case 'win32': {
- const gnuTar = yield utils.getGnuTarPathOnWindows();
- const systemTar = constants_1.SystemTarPathOnWindows;
- if (gnuTar) {
- // Use GNUtar as default on windows
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
+ const systemTar = `${process.env['windir']}\\System32\\tar.exe`;
+ if (compressionMethod !== constants_1.CompressionMethod.Gzip) {
+ // We only use zstandard compression on windows when gnu tar is installed due to
+ // a bug with compressing large files with bsdtar + zstd
+ args.push('--force-local');
}
else if (fs_1.existsSync(systemTar)) {
- return { path: systemTar, type: constants_1.ArchiveToolType.BSD };
+ return systemTar;
+ }
+ else if (yield utils.isGnuTarInstalled()) {
+ args.push('--force-local');
}
break;
}
@@ -38136,92 +38137,25 @@ function getTarPath() {
const gnuTar = yield io.which('gtar', false);
if (gnuTar) {
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
- }
- else {
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.BSD
- };
+ args.push('--delay-directory-restore');
+ return gnuTar;
}
+ break;
}
default:
break;
}
- // Default assumption is GNU tar is present in path
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.GNU
- };
+ return yield io.which('tar', true);
});
}
-// Return arguments for tar as per tarPath, compressionMethod, method type and os
-function getTarArgs(tarPath, compressionMethod, type, archivePath = '') {
+function execTar(args, compressionMethod, cwd) {
return __awaiter(this, void 0, void 0, function* () {
- const args = [`"${tarPath.path}"`];
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const tarFile = 'cache.tar';
- const workingDirectory = getWorkingDirectory();
- // Speficic args for BSD tar on windows for workaround
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- // Method specific args
- switch (type) {
- case 'create':
- args.push('--posix', '-cf', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--exclude', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--files-from', constants_1.ManifestFilename);
- break;
- case 'extract':
- args.push('-xf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'));
- break;
- case 'list':
- args.push('-tf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P');
- break;
+ try {
+ yield exec_1.exec(`"${yield getTarPath(args, compressionMethod)}"`, args, { cwd });
}
- // Platform specific args
- if (tarPath.type === constants_1.ArchiveToolType.GNU) {
- switch (process.platform) {
- case 'win32':
- args.push('--force-local');
- break;
- case 'darwin':
- args.push('--delay-directory-restore');
- break;
- }
+ catch (error) {
+ throw new Error(`Tar failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
}
- return args;
- });
-}
-// Returns commands to run tar and compression program
-function getCommands(compressionMethod, type, archivePath = '') {
- return __awaiter(this, void 0, void 0, function* () {
- let args;
- const tarPath = yield getTarPath();
- const tarArgs = yield getTarArgs(tarPath, compressionMethod, type, archivePath);
- const compressionArgs = type !== 'create'
- ? yield getDecompressionProgram(tarPath, compressionMethod, archivePath)
- : yield getCompressionProgram(tarPath, compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- if (BSD_TAR_ZSTD && type !== 'create') {
- args = [[...compressionArgs].join(' '), [...tarArgs].join(' ')];
- }
- else {
- args = [[...tarArgs].join(' '), [...compressionArgs].join(' ')];
- }
- if (BSD_TAR_ZSTD) {
- return args;
- }
- return [args.join(' ')];
});
}
function getWorkingDirectory() {
@@ -38229,116 +38163,91 @@ function getWorkingDirectory() {
return (_a = process.env['GITHUB_WORKSPACE']) !== null && _a !== void 0 ? _a : process.cwd();
}
// Common function for extractTar and listTar to get the compression method
-function getDecompressionProgram(tarPath, compressionMethod, archivePath) {
- return __awaiter(this, void 0, void 0, function* () {
- // -d: Decompress.
- // unzstd is equivalent to 'zstd -d'
- // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
- // Using 30 here because we also support 32-bit self-hosted runners.
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d --long=30 -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'];
- default:
- return ['-z'];
- }
- });
+function getCompressionProgram(compressionMethod) {
+ // -d: Decompress.
+ // unzstd is equivalent to 'zstd -d'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd'];
+ default:
+ return ['-z'];
+ }
}
-// Used for creating the archive
-// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
-// zstdmt is equivalent to 'zstd -T0'
-// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
-// Using 30 here because we also support 32-bit self-hosted runners.
-// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
-function getCompressionProgram(tarPath, compressionMethod) {
- return __awaiter(this, void 0, void 0, function* () {
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 --long=30 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt'];
- default:
- return ['-z'];
- }
- });
-}
-// Executes all commands as separate processes
-function execCommands(commands, cwd) {
- return __awaiter(this, void 0, void 0, function* () {
- for (const command of commands) {
- try {
- yield exec_1.exec(command, undefined, { cwd });
- }
- catch (error) {
- throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
- }
- }
- });
-}
-// List the contents of a tar
function listTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
- const commands = yield getCommands(compressionMethod, 'list', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-tf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P'
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.listTar = listTar;
-// Extract a tar
function extractTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Create directory to extract tar into
const workingDirectory = getWorkingDirectory();
yield io.mkdirP(workingDirectory);
- const commands = yield getCommands(compressionMethod, 'extract', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-xf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.extractTar = extractTar;
-// Create a tar
function createTar(archiveFolder, sourceDirectories, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Write source directories to manifest.txt to avoid command length limits
- fs_1.writeFileSync(path.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join('\n'));
- const commands = yield getCommands(compressionMethod, 'create');
- yield execCommands(commands, archiveFolder);
+ const manifestFilename = 'manifest.txt';
+ const cacheFileName = utils.getCacheFileName(compressionMethod);
+ fs_1.writeFileSync(path.join(archiveFolder, manifestFilename), sourceDirectories.join('\n'));
+ const workingDirectory = getWorkingDirectory();
+ // -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
+ // zstdmt is equivalent to 'zstd -T0'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ // Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
+ function getCompressionProgram() {
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt'];
+ default:
+ return ['-z'];
+ }
+ }
+ const args = [
+ '--posix',
+ ...getCompressionProgram(),
+ '-cf',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--exclude',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--files-from',
+ manifestFilename
+ ];
+ yield execTar(args, compressionMethod, archiveFolder);
});
}
exports.createTar = createTar;
@@ -47146,7 +47055,6 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const cacheHttpClient = __importStar(__webpack_require__(114));
const tar_1 = __webpack_require__(434);
-const constants_1 = __webpack_require__(931);
class ValidationError extends Error {
constructor(message) {
super(message);
@@ -47208,31 +47116,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
for (const key of keys) {
checkKey(key);
}
- let cacheEntry;
- let compressionMethod = yield utils.getCompressionMethod();
+ const compressionMethod = yield utils.getCompressionMethod();
let archivePath = '';
try {
// path are needed to compute version
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
+ const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
compressionMethod
});
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- // This is to support the old cache entry created by gzip on windows.
- if (process.platform === 'win32' &&
- compressionMethod !== constants_1.CompressionMethod.Gzip) {
- compressionMethod = constants_1.CompressionMethod.Gzip;
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
- compressionMethod
- });
- if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- return undefined;
- }
- core.debug("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
- }
- else {
- // Cache not found
- return undefined;
- }
+ // Cache not found
+ return undefined;
}
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
core.debug(`Archive Path: ${archivePath}`);
@@ -53342,11 +53235,6 @@ var CompressionMethod;
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
-var ArchiveToolType;
-(function (ArchiveToolType) {
- ArchiveToolType["GNU"] = "gnu";
- ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
@@ -53355,12 +53243,6 @@ exports.DefaultRetryDelay = 5000;
// over the socket during this period, the socket is destroyed and the download
// is aborted.
exports.SocketTimeout = 5000;
-// The default path of GNUtar on hosted Windows runners
-exports.GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`;
-// The default path of BSDtar on hosted Windows runners
-exports.SystemTarPathOnWindows = `${process.env['SYSTEMDRIVE']}\\Windows\\System32\\tar.exe`;
-exports.TarFilename = 'cache.tar';
-exports.ManifestFilename = 'manifest.txt';
//# sourceMappingURL=constants.js.map
/***/ }),
diff --git a/dist/save-only/index.js b/dist/save-only/index.js
index 2f8d753..b7da72d 100644
--- a/dist/save-only/index.js
+++ b/dist/save-only/index.js
@@ -1233,6 +1233,10 @@ function getVersion(app) {
// Use zstandard if possible to maximize cache performance
function getCompressionMethod() {
return __awaiter(this, void 0, void 0, function* () {
+ if (process.platform === 'win32' && !(yield isGnuTarInstalled())) {
+ // Disable zstd due to bug https://github.com/actions/cache/issues/301
+ return constants_1.CompressionMethod.Gzip;
+ }
const versionOutput = yield getVersion('zstd');
const version = semver.clean(versionOutput);
if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
@@ -1256,16 +1260,13 @@ function getCacheFileName(compressionMethod) {
: constants_1.CacheFilename.Zstd;
}
exports.getCacheFileName = getCacheFileName;
-function getGnuTarPathOnWindows() {
+function isGnuTarInstalled() {
return __awaiter(this, void 0, void 0, function* () {
- if (fs.existsSync(constants_1.GnuTarPathOnWindows)) {
- return constants_1.GnuTarPathOnWindows;
- }
const versionOutput = yield getVersion('tar');
- return versionOutput.toLowerCase().includes('gnu tar') ? io.which('tar') : '';
+ return versionOutput.toLowerCase().includes('gnu tar');
});
}
-exports.getGnuTarPathOnWindows = getGnuTarPathOnWindows;
+exports.isGnuTarInstalled = isGnuTarInstalled;
function assertDefined(name, value) {
if (value === undefined) {
throw Error(`Expected ${name} but value was undefiend`);
@@ -3488,7 +3489,6 @@ function getCacheEntry(keys, paths, options) {
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
if (response.statusCode === 204) {
- // Cache not found
return null;
}
if (!requestUtils_1.isSuccessStatusCode(response.statusCode)) {
@@ -3497,7 +3497,6 @@ function getCacheEntry(keys, paths, options) {
const cacheResult = response.result;
const cacheDownloadUrl = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.archiveLocation;
if (!cacheDownloadUrl) {
- // Cache achiveLocation not found. This should never happen, and hence bail out.
throw new Error('Cache not found.');
}
core.setSecret(cacheDownloadUrl);
@@ -38167,19 +38166,21 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const constants_1 = __webpack_require__(931);
const IS_WINDOWS = process.platform === 'win32';
-// Returns tar path and type: BSD or GNU
-function getTarPath() {
+function getTarPath(args, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
switch (process.platform) {
case 'win32': {
- const gnuTar = yield utils.getGnuTarPathOnWindows();
- const systemTar = constants_1.SystemTarPathOnWindows;
- if (gnuTar) {
- // Use GNUtar as default on windows
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
+ const systemTar = `${process.env['windir']}\\System32\\tar.exe`;
+ if (compressionMethod !== constants_1.CompressionMethod.Gzip) {
+ // We only use zstandard compression on windows when gnu tar is installed due to
+ // a bug with compressing large files with bsdtar + zstd
+ args.push('--force-local');
}
else if (fs_1.existsSync(systemTar)) {
- return { path: systemTar, type: constants_1.ArchiveToolType.BSD };
+ return systemTar;
+ }
+ else if (yield utils.isGnuTarInstalled()) {
+ args.push('--force-local');
}
break;
}
@@ -38187,92 +38188,25 @@ function getTarPath() {
const gnuTar = yield io.which('gtar', false);
if (gnuTar) {
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
- }
- else {
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.BSD
- };
+ args.push('--delay-directory-restore');
+ return gnuTar;
}
+ break;
}
default:
break;
}
- // Default assumption is GNU tar is present in path
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.GNU
- };
+ return yield io.which('tar', true);
});
}
-// Return arguments for tar as per tarPath, compressionMethod, method type and os
-function getTarArgs(tarPath, compressionMethod, type, archivePath = '') {
+function execTar(args, compressionMethod, cwd) {
return __awaiter(this, void 0, void 0, function* () {
- const args = [`"${tarPath.path}"`];
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const tarFile = 'cache.tar';
- const workingDirectory = getWorkingDirectory();
- // Speficic args for BSD tar on windows for workaround
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- // Method specific args
- switch (type) {
- case 'create':
- args.push('--posix', '-cf', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--exclude', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--files-from', constants_1.ManifestFilename);
- break;
- case 'extract':
- args.push('-xf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'));
- break;
- case 'list':
- args.push('-tf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P');
- break;
+ try {
+ yield exec_1.exec(`"${yield getTarPath(args, compressionMethod)}"`, args, { cwd });
}
- // Platform specific args
- if (tarPath.type === constants_1.ArchiveToolType.GNU) {
- switch (process.platform) {
- case 'win32':
- args.push('--force-local');
- break;
- case 'darwin':
- args.push('--delay-directory-restore');
- break;
- }
+ catch (error) {
+ throw new Error(`Tar failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
}
- return args;
- });
-}
-// Returns commands to run tar and compression program
-function getCommands(compressionMethod, type, archivePath = '') {
- return __awaiter(this, void 0, void 0, function* () {
- let args;
- const tarPath = yield getTarPath();
- const tarArgs = yield getTarArgs(tarPath, compressionMethod, type, archivePath);
- const compressionArgs = type !== 'create'
- ? yield getDecompressionProgram(tarPath, compressionMethod, archivePath)
- : yield getCompressionProgram(tarPath, compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- if (BSD_TAR_ZSTD && type !== 'create') {
- args = [[...compressionArgs].join(' '), [...tarArgs].join(' ')];
- }
- else {
- args = [[...tarArgs].join(' '), [...compressionArgs].join(' ')];
- }
- if (BSD_TAR_ZSTD) {
- return args;
- }
- return [args.join(' ')];
});
}
function getWorkingDirectory() {
@@ -38280,116 +38214,91 @@ function getWorkingDirectory() {
return (_a = process.env['GITHUB_WORKSPACE']) !== null && _a !== void 0 ? _a : process.cwd();
}
// Common function for extractTar and listTar to get the compression method
-function getDecompressionProgram(tarPath, compressionMethod, archivePath) {
- return __awaiter(this, void 0, void 0, function* () {
- // -d: Decompress.
- // unzstd is equivalent to 'zstd -d'
- // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
- // Using 30 here because we also support 32-bit self-hosted runners.
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d --long=30 -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'];
- default:
- return ['-z'];
- }
- });
+function getCompressionProgram(compressionMethod) {
+ // -d: Decompress.
+ // unzstd is equivalent to 'zstd -d'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd'];
+ default:
+ return ['-z'];
+ }
}
-// Used for creating the archive
-// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
-// zstdmt is equivalent to 'zstd -T0'
-// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
-// Using 30 here because we also support 32-bit self-hosted runners.
-// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
-function getCompressionProgram(tarPath, compressionMethod) {
- return __awaiter(this, void 0, void 0, function* () {
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 --long=30 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt'];
- default:
- return ['-z'];
- }
- });
-}
-// Executes all commands as separate processes
-function execCommands(commands, cwd) {
- return __awaiter(this, void 0, void 0, function* () {
- for (const command of commands) {
- try {
- yield exec_1.exec(command, undefined, { cwd });
- }
- catch (error) {
- throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
- }
- }
- });
-}
-// List the contents of a tar
function listTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
- const commands = yield getCommands(compressionMethod, 'list', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-tf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P'
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.listTar = listTar;
-// Extract a tar
function extractTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Create directory to extract tar into
const workingDirectory = getWorkingDirectory();
yield io.mkdirP(workingDirectory);
- const commands = yield getCommands(compressionMethod, 'extract', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-xf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.extractTar = extractTar;
-// Create a tar
function createTar(archiveFolder, sourceDirectories, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Write source directories to manifest.txt to avoid command length limits
- fs_1.writeFileSync(path.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join('\n'));
- const commands = yield getCommands(compressionMethod, 'create');
- yield execCommands(commands, archiveFolder);
+ const manifestFilename = 'manifest.txt';
+ const cacheFileName = utils.getCacheFileName(compressionMethod);
+ fs_1.writeFileSync(path.join(archiveFolder, manifestFilename), sourceDirectories.join('\n'));
+ const workingDirectory = getWorkingDirectory();
+ // -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
+ // zstdmt is equivalent to 'zstd -T0'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ // Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
+ function getCompressionProgram() {
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt'];
+ default:
+ return ['-z'];
+ }
+ }
+ const args = [
+ '--posix',
+ ...getCompressionProgram(),
+ '-cf',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--exclude',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--files-from',
+ manifestFilename
+ ];
+ yield execTar(args, compressionMethod, archiveFolder);
});
}
exports.createTar = createTar;
@@ -47288,7 +47197,6 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const cacheHttpClient = __importStar(__webpack_require__(114));
const tar_1 = __webpack_require__(434);
-const constants_1 = __webpack_require__(931);
class ValidationError extends Error {
constructor(message) {
super(message);
@@ -47350,31 +47258,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
for (const key of keys) {
checkKey(key);
}
- let cacheEntry;
- let compressionMethod = yield utils.getCompressionMethod();
+ const compressionMethod = yield utils.getCompressionMethod();
let archivePath = '';
try {
// path are needed to compute version
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
+ const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
compressionMethod
});
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- // This is to support the old cache entry created by gzip on windows.
- if (process.platform === 'win32' &&
- compressionMethod !== constants_1.CompressionMethod.Gzip) {
- compressionMethod = constants_1.CompressionMethod.Gzip;
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
- compressionMethod
- });
- if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- return undefined;
- }
- core.debug("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
- }
- else {
- // Cache not found
- return undefined;
- }
+ // Cache not found
+ return undefined;
}
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
core.debug(`Archive Path: ${archivePath}`);
@@ -53377,11 +53270,6 @@ var CompressionMethod;
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
-var ArchiveToolType;
-(function (ArchiveToolType) {
- ArchiveToolType["GNU"] = "gnu";
- ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
@@ -53390,12 +53278,6 @@ exports.DefaultRetryDelay = 5000;
// over the socket during this period, the socket is destroyed and the download
// is aborted.
exports.SocketTimeout = 5000;
-// The default path of GNUtar on hosted Windows runners
-exports.GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`;
-// The default path of BSDtar on hosted Windows runners
-exports.SystemTarPathOnWindows = `${process.env['SYSTEMDRIVE']}\\Windows\\System32\\tar.exe`;
-exports.TarFilename = 'cache.tar';
-exports.ManifestFilename = 'manifest.txt';
//# sourceMappingURL=constants.js.map
/***/ }),
diff --git a/dist/save/index.js b/dist/save/index.js
index 10a6548..4b27928 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -1177,6 +1177,10 @@ function getVersion(app) {
// Use zstandard if possible to maximize cache performance
function getCompressionMethod() {
return __awaiter(this, void 0, void 0, function* () {
+ if (process.platform === 'win32' && !(yield isGnuTarInstalled())) {
+ // Disable zstd due to bug https://github.com/actions/cache/issues/301
+ return constants_1.CompressionMethod.Gzip;
+ }
const versionOutput = yield getVersion('zstd');
const version = semver.clean(versionOutput);
if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
@@ -1200,16 +1204,13 @@ function getCacheFileName(compressionMethod) {
: constants_1.CacheFilename.Zstd;
}
exports.getCacheFileName = getCacheFileName;
-function getGnuTarPathOnWindows() {
+function isGnuTarInstalled() {
return __awaiter(this, void 0, void 0, function* () {
- if (fs.existsSync(constants_1.GnuTarPathOnWindows)) {
- return constants_1.GnuTarPathOnWindows;
- }
const versionOutput = yield getVersion('tar');
- return versionOutput.toLowerCase().includes('gnu tar') ? io.which('tar') : '';
+ return versionOutput.toLowerCase().includes('gnu tar');
});
}
-exports.getGnuTarPathOnWindows = getGnuTarPathOnWindows;
+exports.isGnuTarInstalled = isGnuTarInstalled;
function assertDefined(name, value) {
if (value === undefined) {
throw Error(`Expected ${name} but value was undefiend`);
@@ -3432,7 +3433,6 @@ function getCacheEntry(keys, paths, options) {
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
if (response.statusCode === 204) {
- // Cache not found
return null;
}
if (!requestUtils_1.isSuccessStatusCode(response.statusCode)) {
@@ -3441,7 +3441,6 @@ function getCacheEntry(keys, paths, options) {
const cacheResult = response.result;
const cacheDownloadUrl = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.archiveLocation;
if (!cacheDownloadUrl) {
- // Cache achiveLocation not found. This should never happen, and hence bail out.
throw new Error('Cache not found.');
}
core.setSecret(cacheDownloadUrl);
@@ -38111,19 +38110,21 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const constants_1 = __webpack_require__(931);
const IS_WINDOWS = process.platform === 'win32';
-// Returns tar path and type: BSD or GNU
-function getTarPath() {
+function getTarPath(args, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
switch (process.platform) {
case 'win32': {
- const gnuTar = yield utils.getGnuTarPathOnWindows();
- const systemTar = constants_1.SystemTarPathOnWindows;
- if (gnuTar) {
- // Use GNUtar as default on windows
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
+ const systemTar = `${process.env['windir']}\\System32\\tar.exe`;
+ if (compressionMethod !== constants_1.CompressionMethod.Gzip) {
+ // We only use zstandard compression on windows when gnu tar is installed due to
+ // a bug with compressing large files with bsdtar + zstd
+ args.push('--force-local');
}
else if (fs_1.existsSync(systemTar)) {
- return { path: systemTar, type: constants_1.ArchiveToolType.BSD };
+ return systemTar;
+ }
+ else if (yield utils.isGnuTarInstalled()) {
+ args.push('--force-local');
}
break;
}
@@ -38131,92 +38132,25 @@ function getTarPath() {
const gnuTar = yield io.which('gtar', false);
if (gnuTar) {
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
- return { path: gnuTar, type: constants_1.ArchiveToolType.GNU };
- }
- else {
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.BSD
- };
+ args.push('--delay-directory-restore');
+ return gnuTar;
}
+ break;
}
default:
break;
}
- // Default assumption is GNU tar is present in path
- return {
- path: yield io.which('tar', true),
- type: constants_1.ArchiveToolType.GNU
- };
+ return yield io.which('tar', true);
});
}
-// Return arguments for tar as per tarPath, compressionMethod, method type and os
-function getTarArgs(tarPath, compressionMethod, type, archivePath = '') {
+function execTar(args, compressionMethod, cwd) {
return __awaiter(this, void 0, void 0, function* () {
- const args = [`"${tarPath.path}"`];
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const tarFile = 'cache.tar';
- const workingDirectory = getWorkingDirectory();
- // Speficic args for BSD tar on windows for workaround
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- // Method specific args
- switch (type) {
- case 'create':
- args.push('--posix', '-cf', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--exclude', BSD_TAR_ZSTD
- ? tarFile
- : cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--files-from', constants_1.ManifestFilename);
- break;
- case 'extract':
- args.push('-xf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'));
- break;
- case 'list':
- args.push('-tf', BSD_TAR_ZSTD
- ? tarFile
- : archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P');
- break;
+ try {
+ yield exec_1.exec(`"${yield getTarPath(args, compressionMethod)}"`, args, { cwd });
}
- // Platform specific args
- if (tarPath.type === constants_1.ArchiveToolType.GNU) {
- switch (process.platform) {
- case 'win32':
- args.push('--force-local');
- break;
- case 'darwin':
- args.push('--delay-directory-restore');
- break;
- }
+ catch (error) {
+ throw new Error(`Tar failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
}
- return args;
- });
-}
-// Returns commands to run tar and compression program
-function getCommands(compressionMethod, type, archivePath = '') {
- return __awaiter(this, void 0, void 0, function* () {
- let args;
- const tarPath = yield getTarPath();
- const tarArgs = yield getTarArgs(tarPath, compressionMethod, type, archivePath);
- const compressionArgs = type !== 'create'
- ? yield getDecompressionProgram(tarPath, compressionMethod, archivePath)
- : yield getCompressionProgram(tarPath, compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- if (BSD_TAR_ZSTD && type !== 'create') {
- args = [[...compressionArgs].join(' '), [...tarArgs].join(' ')];
- }
- else {
- args = [[...tarArgs].join(' '), [...compressionArgs].join(' ')];
- }
- if (BSD_TAR_ZSTD) {
- return args;
- }
- return [args.join(' ')];
});
}
function getWorkingDirectory() {
@@ -38224,116 +38158,91 @@ function getWorkingDirectory() {
return (_a = process.env['GITHUB_WORKSPACE']) !== null && _a !== void 0 ? _a : process.cwd();
}
// Common function for extractTar and listTar to get the compression method
-function getDecompressionProgram(tarPath, compressionMethod, archivePath) {
- return __awaiter(this, void 0, void 0, function* () {
- // -d: Decompress.
- // unzstd is equivalent to 'zstd -d'
- // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
- // Using 30 here because we also support 32-bit self-hosted runners.
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d --long=30 -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -d -o',
- constants_1.TarFilename,
- archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'];
- default:
- return ['-z'];
- }
- });
+function getCompressionProgram(compressionMethod) {
+ // -d: Decompress.
+ // unzstd is equivalent to 'zstd -d'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd'];
+ default:
+ return ['-z'];
+ }
}
-// Used for creating the archive
-// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
-// zstdmt is equivalent to 'zstd -T0'
-// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
-// Using 30 here because we also support 32-bit self-hosted runners.
-// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
-function getCompressionProgram(tarPath, compressionMethod) {
- return __awaiter(this, void 0, void 0, function* () {
- const cacheFileName = utils.getCacheFileName(compressionMethod);
- const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
- compressionMethod !== constants_1.CompressionMethod.Gzip &&
- IS_WINDOWS;
- switch (compressionMethod) {
- case constants_1.CompressionMethod.Zstd:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 --long=30 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : [
- '--use-compress-program',
- IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
- ];
- case constants_1.CompressionMethod.ZstdWithoutLong:
- return BSD_TAR_ZSTD
- ? [
- 'zstd -T0 -o',
- cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
- constants_1.TarFilename
- ]
- : ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt'];
- default:
- return ['-z'];
- }
- });
-}
-// Executes all commands as separate processes
-function execCommands(commands, cwd) {
- return __awaiter(this, void 0, void 0, function* () {
- for (const command of commands) {
- try {
- yield exec_1.exec(command, undefined, { cwd });
- }
- catch (error) {
- throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
- }
- }
- });
-}
-// List the contents of a tar
function listTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
- const commands = yield getCommands(compressionMethod, 'list', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-tf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P'
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.listTar = listTar;
-// Extract a tar
function extractTar(archivePath, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Create directory to extract tar into
const workingDirectory = getWorkingDirectory();
yield io.mkdirP(workingDirectory);
- const commands = yield getCommands(compressionMethod, 'extract', archivePath);
- yield execCommands(commands);
+ const args = [
+ ...getCompressionProgram(compressionMethod),
+ '-xf',
+ archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
+ ];
+ yield execTar(args, compressionMethod);
});
}
exports.extractTar = extractTar;
-// Create a tar
function createTar(archiveFolder, sourceDirectories, compressionMethod) {
return __awaiter(this, void 0, void 0, function* () {
// Write source directories to manifest.txt to avoid command length limits
- fs_1.writeFileSync(path.join(archiveFolder, constants_1.ManifestFilename), sourceDirectories.join('\n'));
- const commands = yield getCommands(compressionMethod, 'create');
- yield execCommands(commands, archiveFolder);
+ const manifestFilename = 'manifest.txt';
+ const cacheFileName = utils.getCacheFileName(compressionMethod);
+ fs_1.writeFileSync(path.join(archiveFolder, manifestFilename), sourceDirectories.join('\n'));
+ const workingDirectory = getWorkingDirectory();
+ // -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
+ // zstdmt is equivalent to 'zstd -T0'
+ // --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
+ // Using 30 here because we also support 32-bit self-hosted runners.
+ // Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
+ function getCompressionProgram() {
+ switch (compressionMethod) {
+ case constants_1.CompressionMethod.Zstd:
+ return [
+ '--use-compress-program',
+ IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30'
+ ];
+ case constants_1.CompressionMethod.ZstdWithoutLong:
+ return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt'];
+ default:
+ return ['-z'];
+ }
+ }
+ const args = [
+ '--posix',
+ ...getCompressionProgram(),
+ '-cf',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--exclude',
+ cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '-P',
+ '-C',
+ workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
+ '--files-from',
+ manifestFilename
+ ];
+ yield execTar(args, compressionMethod, archiveFolder);
});
}
exports.createTar = createTar;
@@ -47261,7 +47170,6 @@ const path = __importStar(__webpack_require__(622));
const utils = __importStar(__webpack_require__(15));
const cacheHttpClient = __importStar(__webpack_require__(114));
const tar_1 = __webpack_require__(434);
-const constants_1 = __webpack_require__(931);
class ValidationError extends Error {
constructor(message) {
super(message);
@@ -47323,31 +47231,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
for (const key of keys) {
checkKey(key);
}
- let cacheEntry;
- let compressionMethod = yield utils.getCompressionMethod();
+ const compressionMethod = yield utils.getCompressionMethod();
let archivePath = '';
try {
// path are needed to compute version
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
+ const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
compressionMethod
});
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- // This is to support the old cache entry created by gzip on windows.
- if (process.platform === 'win32' &&
- compressionMethod !== constants_1.CompressionMethod.Gzip) {
- compressionMethod = constants_1.CompressionMethod.Gzip;
- cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
- compressionMethod
- });
- if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
- return undefined;
- }
- core.debug("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
- }
- else {
- // Cache not found
- return undefined;
- }
+ // Cache not found
+ return undefined;
}
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
core.debug(`Archive Path: ${archivePath}`);
@@ -53350,11 +53243,6 @@ var CompressionMethod;
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
-var ArchiveToolType;
-(function (ArchiveToolType) {
- ArchiveToolType["GNU"] = "gnu";
- ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
@@ -53363,12 +53251,6 @@ exports.DefaultRetryDelay = 5000;
// over the socket during this period, the socket is destroyed and the download
// is aborted.
exports.SocketTimeout = 5000;
-// The default path of GNUtar on hosted Windows runners
-exports.GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`;
-// The default path of BSDtar on hosted Windows runners
-exports.SystemTarPathOnWindows = `${process.env['SYSTEMDRIVE']}\\Windows\\System32\\tar.exe`;
-exports.TarFilename = 'cache.tar';
-exports.ManifestFilename = 'manifest.txt';
//# sourceMappingURL=constants.js.map
/***/ }),
diff --git a/package-lock.json b/package-lock.json
index 9b0b520..d219d01 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
{
"name": "cache",
- "version": "3.2.0-beta.1",
+ "version": "3.2.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "cache",
- "version": "3.2.0-beta.1",
+ "version": "3.2.0",
"license": "MIT",
"dependencies": {
- "@actions/cache": "3.1.0-beta.3",
+ "@actions/cache": "^3.0.6",
"@actions/core": "^1.10.0",
"@actions/exec": "^1.1.1",
"@actions/io": "^1.1.2"
@@ -36,9 +36,9 @@
}
},
"node_modules/@actions/cache": {
- "version": "3.1.0-beta.3",
- "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.0-beta.3.tgz",
- "integrity": "sha512-71S1vd0WKLbC2lAe04pCYqTLBjSa8gURtiqnVBCYAt8QVBjOfwa2D3ESf2m8K2xjUxman/Yimdp7CPJDyFnxZg==",
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.6.tgz",
+ "integrity": "sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==",
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/exec": "^1.0.1",
@@ -9722,9 +9722,9 @@
},
"dependencies": {
"@actions/cache": {
- "version": "3.1.0-beta.3",
- "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.1.0-beta.3.tgz",
- "integrity": "sha512-71S1vd0WKLbC2lAe04pCYqTLBjSa8gURtiqnVBCYAt8QVBjOfwa2D3ESf2m8K2xjUxman/Yimdp7CPJDyFnxZg==",
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/@actions/cache/-/cache-3.0.6.tgz",
+ "integrity": "sha512-Tttit+nqmxgb2M5Ufj5p8Lwd+fx329HOTLzxMrY4aaaZqBzqetgWlEfszMyiXfX4cJML+bzLJbyD9rNYt8TJ8g==",
"requires": {
"@actions/core": "^1.10.0",
"@actions/exec": "^1.0.1",
diff --git a/package.json b/package.json
index d6d2700..eaa0cd3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cache",
- "version": "3.2.0-beta.1",
+ "version": "3.2.0",
"private": true,
"description": "Cache dependencies and build outputs",
"main": "dist/restore/index.js",
@@ -23,7 +23,7 @@
"author": "GitHub",
"license": "MIT",
"dependencies": {
- "@actions/cache": "3.1.0-beta.3",
+ "@actions/cache": "^3.0.6",
"@actions/core": "^1.10.0",
"@actions/exec": "^1.1.1",
"@actions/io": "^1.1.2"