@@ -2179,7 +2179,7 @@ exports.digestForStream = digestForStream;
21792179
21802180/***/ }),
21812181
2182- /***/ 5185 :
2182+ /***/ 4609 :
21832183/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
21842184
21852185
@@ -2202,9 +2202,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
22022202Object.defineProperty(exports, "__esModule", ({ value: true }));
22032203const core = __importStar(__nccwpck_require__(7733));
22042204const path = __importStar(__nccwpck_require__(1017));
2205- const utils = __importStar(__nccwpck_require__(2018 ));
2206- const cacheHttpClient = __importStar(__nccwpck_require__(123 ));
2207- const tar_1 = __nccwpck_require__(7364 );
2205+ const utils = __importStar(__nccwpck_require__(2707 ));
2206+ const cacheHttpClient = __importStar(__nccwpck_require__(1598 ));
2207+ const tar_1 = __nccwpck_require__(973 );
22082208class ValidationError extends Error {
22092209    constructor(message) {
22102210        super(message);
@@ -2399,7 +2399,7 @@ exports.saveCache = saveCache;
23992399
24002400/***/ }),
24012401
2402- /***/ 123 :
2402+ /***/ 1598 :
24032403/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
24042404
24052405
@@ -2426,10 +2426,10 @@ const auth_1 = __nccwpck_require__(6931);
24262426const crypto = __importStar(__nccwpck_require__(6113));
24272427const fs = __importStar(__nccwpck_require__(7147));
24282428const url_1 = __nccwpck_require__(7310);
2429- const utils = __importStar(__nccwpck_require__(2018 ));
2430- const downloadUtils_1 = __nccwpck_require__(5634 );
2431- const options_1 = __nccwpck_require__(7855 );
2432- const requestUtils_1 = __nccwpck_require__(7738 );
2429+ const utils = __importStar(__nccwpck_require__(2707 ));
2430+ const downloadUtils_1 = __nccwpck_require__(6898 );
2431+ const options_1 = __nccwpck_require__(4090 );
2432+ const requestUtils_1 = __nccwpck_require__(8536 );
24332433const versionSalt = '1.0';
24342434function getCacheApiUrl(resource) {
24352435    const baseUrl = process.env['ACTIONS_CACHE_URL'] || '';
@@ -2646,7 +2646,7 @@ exports.saveCache = saveCache;
26462646
26472647/***/ }),
26482648
2649- /***/ 2018 :
2649+ /***/ 2707 :
26502650/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
26512651
26522652
@@ -2683,7 +2683,7 @@ const path = __importStar(__nccwpck_require__(1017));
26832683const semver = __importStar(__nccwpck_require__(3496));
26842684const util = __importStar(__nccwpck_require__(3837));
26852685const uuid_1 = __nccwpck_require__(1090);
2686- const constants_1 = __nccwpck_require__(7810 );
2686+ const constants_1 = __nccwpck_require__(2114 );
26872687// From https://github.com/actions/toolkit/blob/main/packages/tool-cache/src/tool-cache.ts#L23
26882688function createTempDirectory() {
26892689    return __awaiter(this, void 0, void 0, function* () {
@@ -2758,12 +2758,13 @@ function unlinkFile(filePath) {
27582758    });
27592759}
27602760exports.unlinkFile = unlinkFile;
2761- function getVersion(app) {
2761+ function getVersion(app, additionalArgs = [] ) {
27622762    return __awaiter(this, void 0, void 0, function* () {
2763-         core.debug(`Checking ${app} --version`);
27642763        let versionOutput = '';
2764+         additionalArgs.push('--version');
2765+         core.debug(`Checking ${app} ${additionalArgs.join(' ')}`);
27652766        try {
2766-             yield exec.exec(`${app} --version `, [] , {
2767+             yield exec.exec(`${app}`, additionalArgs , {
27672768                ignoreReturnCode: true,
27682769                silent: true,
27692770                listeners: {
@@ -2783,19 +2784,14 @@ function getVersion(app) {
27832784// Use zstandard if possible to maximize cache performance
27842785function getCompressionMethod() {
27852786    return __awaiter(this, void 0, void 0, function* () {
2786-         const versionOutput = yield getVersion('zstd');
2787+         const versionOutput = yield getVersion('zstd', ['--quiet'] );
27872788        const version = semver.clean(versionOutput);
2788-         if (!versionOutput.toLowerCase().includes(' zstd command line interface')) { 
2789-             // zstd is not installed 
2789+         core.debug(` zstd version: ${version}`); 
2790+         if (versionOutput === '') { 
27902791            return constants_1.CompressionMethod.Gzip;
27912792        }
2792-         else if (!version || semver.lt(version, 'v1.3.2')) {
2793-             // zstd is installed but using a version earlier than v1.3.2
2794-             // v1.3.2 is required to use the `--long` options in zstd
2795-             return constants_1.CompressionMethod.ZstdWithoutLong;
2796-         }
27972793        else {
2798-             return constants_1.CompressionMethod.Zstd ;
2794+             return constants_1.CompressionMethod.ZstdWithoutLong ;
27992795        }
28002796    });
28012797}
@@ -2832,7 +2828,7 @@ exports.isGhes = isGhes;
28322828
28332829/***/ }),
28342830
2835- /***/ 7810 :
2831+ /***/ 2114 :
28362832/***/ ((__unused_webpack_module, exports) => {
28372833
28382834
@@ -2873,7 +2869,7 @@ exports.ManifestFilename = 'manifest.txt';
28732869
28742870/***/ }),
28752871
2876- /***/ 5634 :
2872+ /***/ 6898 :
28772873/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
28782874
28792875
@@ -2901,9 +2897,9 @@ const buffer = __importStar(__nccwpck_require__(4300));
29012897const fs = __importStar(__nccwpck_require__(7147));
29022898const stream = __importStar(__nccwpck_require__(2781));
29032899const util = __importStar(__nccwpck_require__(3837));
2904- const utils = __importStar(__nccwpck_require__(2018 ));
2905- const constants_1 = __nccwpck_require__(7810 );
2906- const requestUtils_1 = __nccwpck_require__(7738 );
2900+ const utils = __importStar(__nccwpck_require__(2707 ));
2901+ const constants_1 = __nccwpck_require__(2114 );
2902+ const requestUtils_1 = __nccwpck_require__(8536 );
29072903const abort_controller_1 = __nccwpck_require__(4992);
29082904/**
29092905 * Pipes the body of a HTTP response to a stream
@@ -3130,7 +3126,7 @@ const promiseWithTimeout = (timeoutMs, promise) => __awaiter(void 0, void 0, voi
31303126
31313127/***/ }),
31323128
3133- /***/ 7738 :
3129+ /***/ 8536 :
31343130/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
31353131
31363132
@@ -3153,7 +3149,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
31533149Object.defineProperty(exports, "__esModule", ({ value: true }));
31543150const core = __importStar(__nccwpck_require__(7733));
31553151const http_client_1 = __nccwpck_require__(3569);
3156- const constants_1 = __nccwpck_require__(7810 );
3152+ const constants_1 = __nccwpck_require__(2114 );
31573153function isSuccessStatusCode(statusCode) {
31583154    if (!statusCode) {
31593155        return false;
@@ -3256,7 +3252,7 @@ exports.retryHttpClientResponse = retryHttpClientResponse;
32563252
32573253/***/ }),
32583254
3259- /***/ 7364 :
3255+ /***/ 973 :
32603256/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
32613257
32623258
@@ -3281,8 +3277,8 @@ const exec_1 = __nccwpck_require__(1757);
32813277const io = __importStar(__nccwpck_require__(1318));
32823278const fs_1 = __nccwpck_require__(7147);
32833279const path = __importStar(__nccwpck_require__(1017));
3284- const utils = __importStar(__nccwpck_require__(2018 ));
3285- const constants_1 = __nccwpck_require__(7810 );
3280+ const utils = __importStar(__nccwpck_require__(2707 ));
3281+ const constants_1 = __nccwpck_require__(2114 );
32863282const IS_WINDOWS = process.platform === 'win32';
32873283// Returns tar path and type: BSD or GNU
32883284function getTarPath() {
@@ -3517,7 +3513,7 @@ exports.createTar = createTar;
35173513
35183514/***/ }),
35193515
3520- /***/ 7855 :
3516+ /***/ 4090 :
35213517/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
35223518
35233519
@@ -68421,7 +68417,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
6842168417/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(514);
6842268418/* harmony import */ var _actions_artifact__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(5833);
6842368419/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_2__ = __nccwpck_require__(7733);
68424- /* harmony import */ var _actions_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(5185 );
68420+ /* harmony import */ var _actions_cache__WEBPACK_IMPORTED_MODULE_3__ = __nccwpck_require__(4609 );
6842568421
6842668422
6842768423
0 commit comments