diff --git a/dist/index.mjs b/dist/index.mjs index 9807c3d..9217102 100644 --- a/dist/index.mjs +++ b/dist/index.mjs @@ -1795,7 +1795,7 @@ exports.AbortError = AbortError; /***/ }), -/***/ 2633: +/***/ 7083: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -1835,9 +1835,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.saveCache = exports.restoreCache = exports.isFeatureAvailable = exports.ReserveCacheError = exports.ValidationError = void 0; const core = __importStar(__nccwpck_require__(4278)); const path = __importStar(__nccwpck_require__(1017)); -const utils = __importStar(__nccwpck_require__(6819)); -const cacheHttpClient = __importStar(__nccwpck_require__(9956)); -const tar_1 = __nccwpck_require__(2719); +const utils = __importStar(__nccwpck_require__(7274)); +const cacheHttpClient = __importStar(__nccwpck_require__(3781)); +const tar_1 = __nccwpck_require__(1729); class ValidationError extends Error { constructor(message) { super(message); @@ -2036,7 +2036,7 @@ exports.saveCache = saveCache; /***/ }), -/***/ 9956: +/***/ 3781: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2080,10 +2080,10 @@ const auth_1 = __nccwpck_require__(1361); const crypto = __importStar(__nccwpck_require__(6113)); const fs = __importStar(__nccwpck_require__(7147)); const url_1 = __nccwpck_require__(7310); -const utils = __importStar(__nccwpck_require__(6819)); -const downloadUtils_1 = __nccwpck_require__(3324); -const options_1 = __nccwpck_require__(5428); -const requestUtils_1 = __nccwpck_require__(5503); +const utils = __importStar(__nccwpck_require__(7274)); +const downloadUtils_1 = __nccwpck_require__(5057); +const options_1 = __nccwpck_require__(1773); +const requestUtils_1 = __nccwpck_require__(7136); const versionSalt = '1.0'; function getCacheApiUrl(resource) { const baseUrl = process.env['ACTIONS_CACHE_URL'] || ''; @@ -2111,7 +2111,8 @@ function createHttpClient() { return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions()); } function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) { - const components = paths; + // don't pass changes upstream + const components = paths.slice(); // Add compression method to cache version to restore // compressed cache as per compression method if (compressionMethod) { @@ -2303,7 +2304,7 @@ exports.saveCache = saveCache; /***/ }), -/***/ 6819: +/***/ 7274: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2357,7 +2358,7 @@ const path = __importStar(__nccwpck_require__(1017)); const semver = __importStar(__nccwpck_require__(2211)); const util = __importStar(__nccwpck_require__(3837)); const uuid_1 = __nccwpck_require__(4609); -const constants_1 = __nccwpck_require__(671); +const constants_1 = __nccwpck_require__(2190); // From https://github.com/actions/toolkit/blob/main/packages/tool-cache/src/tool-cache.ts#L23 function createTempDirectory() { return __awaiter(this, void 0, void 0, function* () { @@ -2399,26 +2400,21 @@ function resolvePaths(patterns) { implicitDescendants: false }); try { - for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) { + for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) { _c = _g.value; _e = false; - try { - const file = _c; - const relativeFile = path - .relative(workspace, file) - .replace(new RegExp(`\\${path.sep}`, 'g'), '/'); - core.debug(`Matched: ${relativeFile}`); - // Paths are made relative so the tar entries are all relative to the root of the workspace. - if (relativeFile === '') { - // path.relative returns empty string if workspace and file are equal - paths.push('.'); - } - else { - paths.push(`${relativeFile}`); - } + const file = _c; + const relativeFile = path + .relative(workspace, file) + .replace(new RegExp(`\\${path.sep}`, 'g'), '/'); + core.debug(`Matched: ${relativeFile}`); + // Paths are made relative so the tar entries are all relative to the root of the workspace. + if (relativeFile === '') { + // path.relative returns empty string if workspace and file are equal + paths.push('.'); } - finally { - _e = true; + else { + paths.push(`${relativeFile}`); } } } @@ -2509,7 +2505,7 @@ exports.isGhes = isGhes; /***/ }), -/***/ 671: +/***/ 2190: /***/ ((__unused_webpack_module, exports) => { @@ -2519,7 +2515,7 @@ var CacheFilename; (function (CacheFilename) { CacheFilename["Gzip"] = "cache.tgz"; CacheFilename["Zstd"] = "cache.tzst"; -})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {})); +})(CacheFilename || (exports.CacheFilename = CacheFilename = {})); var CompressionMethod; (function (CompressionMethod) { CompressionMethod["Gzip"] = "gzip"; @@ -2527,12 +2523,12 @@ var CompressionMethod; // This enum is for earlier version of zstd that does not have --long support CompressionMethod["ZstdWithoutLong"] = "zstd-without-long"; CompressionMethod["Zstd"] = "zstd"; -})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {})); +})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {})); var ArchiveToolType; (function (ArchiveToolType) { ArchiveToolType["GNU"] = "gnu"; ArchiveToolType["BSD"] = "bsd"; -})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {})); +})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {})); // The default number of retry attempts. exports.DefaultRetryAttempts = 2; // The default delay in milliseconds between retry attempts. @@ -2551,7 +2547,7 @@ exports.ManifestFilename = 'manifest.txt'; /***/ }), -/***/ 3324: +/***/ 5057: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2596,9 +2592,9 @@ const buffer = __importStar(__nccwpck_require__(4300)); const fs = __importStar(__nccwpck_require__(7147)); const stream = __importStar(__nccwpck_require__(2781)); const util = __importStar(__nccwpck_require__(3837)); -const utils = __importStar(__nccwpck_require__(6819)); -const constants_1 = __nccwpck_require__(671); -const requestUtils_1 = __nccwpck_require__(5503); +const utils = __importStar(__nccwpck_require__(7274)); +const constants_1 = __nccwpck_require__(2190); +const requestUtils_1 = __nccwpck_require__(7136); const abort_controller_1 = __nccwpck_require__(39); /** * Pipes the body of a HTTP response to a stream @@ -2935,7 +2931,7 @@ const promiseWithTimeout = (timeoutMs, promise) => __awaiter(void 0, void 0, voi /***/ }), -/***/ 5503: +/***/ 7136: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -2975,7 +2971,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true })); exports.retryHttpClientResponse = exports.retryTypedResponse = exports.retry = exports.isRetryableStatusCode = exports.isServerErrorStatusCode = exports.isSuccessStatusCode = void 0; const core = __importStar(__nccwpck_require__(4278)); const http_client_1 = __nccwpck_require__(223); -const constants_1 = __nccwpck_require__(671); +const constants_1 = __nccwpck_require__(2190); function isSuccessStatusCode(statusCode) { if (!statusCode) { return false; @@ -3078,7 +3074,7 @@ exports.retryHttpClientResponse = retryHttpClientResponse; /***/ }), -/***/ 2719: +/***/ 1729: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -3120,8 +3116,8 @@ const exec_1 = __nccwpck_require__(8434); const io = __importStar(__nccwpck_require__(6584)); const fs_1 = __nccwpck_require__(7147); const path = __importStar(__nccwpck_require__(1017)); -const utils = __importStar(__nccwpck_require__(6819)); -const constants_1 = __nccwpck_require__(671); +const utils = __importStar(__nccwpck_require__(7274)); +const constants_1 = __nccwpck_require__(2190); const IS_WINDOWS = process.platform === 'win32'; // Returns tar path and type: BSD or GNU function getTarPath() { @@ -3356,7 +3352,7 @@ exports.createTar = createTar; /***/ }), -/***/ 5428: +/***/ 1773: /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) { @@ -44078,7 +44074,7 @@ function expand(str, isTop) { var util = __nccwpck_require__(3837); var Stream = (__nccwpck_require__(2781).Stream); -var DelayedStream = __nccwpck_require__(2439); +var DelayedStream = __nccwpck_require__(6819); module.exports = CombinedStream; function CombinedStream() { @@ -44308,7 +44304,7 @@ var isArray = Array.isArray || function (xs) { /***/ }), -/***/ 2439: +/***/ 6819: /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => { var Stream = (__nccwpck_require__(2781).Stream); @@ -81501,7 +81497,7 @@ __webpack_async_result__(); /***/ ((__webpack_module__, __unused_webpack___webpack_exports__, __nccwpck_require__) => { __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependencies__, __webpack_async_result__) => { try { -/* harmony import */ var _actions_cache__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(2633); +/* harmony import */ var _actions_cache__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(7083); /* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(4278); /* harmony import */ var _actions_exec__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(8434); /* harmony import */ var hasha__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(7219); diff --git a/package.json b/package.json index ffdd604..02c48f2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "lint": "eslint --ignore-path .gitignore ." }, "dependencies": { - "@actions/cache": "^3.2.2", + "@actions/cache": "^3.2.3", "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "hasha": "^6.0.0" diff --git a/yarn.lock b/yarn.lock index 3f51af5..989c777 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,9 +12,9 @@ __metadata: languageName: node linkType: hard -"@actions/cache@npm:^3.2.2": - version: 3.2.2 - resolution: "@actions/cache@npm:3.2.2" +"@actions/cache@npm:^3.2.3": + version: 3.2.3 + resolution: "@actions/cache@npm:3.2.3" dependencies: "@actions/core": "npm:^1.10.0" "@actions/exec": "npm:^1.0.1" @@ -24,9 +24,9 @@ __metadata: "@azure/abort-controller": "npm:^1.1.0" "@azure/ms-rest-js": "npm:^2.6.0" "@azure/storage-blob": "npm:^12.13.0" - semver: "npm:^6.1.0" + semver: "npm:^6.3.1" uuid: "npm:^3.3.3" - checksum: 60ce5ef0ae902ffcf4c20b4940b764df8790decd0846c642f46b44c1497a8d0b47830c78c660b2eab1eb7ddf7008bd9a93f1f2c6ff15341deb58d9ef5c497bdd + checksum: d600f9ae5ecc797184d0f2504f09fc98f12a3e2b90e55eb6cd5ada30b01aa96e992b874556c8e29c352c4a57c68942d68b5421ecddd6970c0ea2b8bcf760f6f9 languageName: node linkType: hard @@ -2456,7 +2456,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^6.1.0": +"semver@npm:^6.3.1": version: 6.3.1 resolution: "semver@npm:6.3.1" bin: @@ -2926,7 +2926,7 @@ __metadata: version: 0.0.0-use.local resolution: "yarn-install-action@workspace:." dependencies: - "@actions/cache": "npm:^3.2.2" + "@actions/cache": "npm:^3.2.3" "@actions/core": "npm:^1.10.1" "@actions/exec": "npm:^1.1.1" "@types/node": "npm:^20.10.7"