@@ -2179,7 +2179,7 @@ exports.digestForStream = digestForStream;
2179
2179
2180
2180
/***/ }),
2181
2181
2182
- /***/ 5185 :
2182
+ /***/ 4609 :
2183
2183
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
2184
2184
2185
2185
@@ -2202,9 +2202,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
2202
2202
Object.defineProperty(exports, "__esModule", ({ value: true }));
2203
2203
const core = __importStar(__nccwpck_require__(7733));
2204
2204
const 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 );
2208
2208
class ValidationError extends Error {
2209
2209
constructor(message) {
2210
2210
super(message);
@@ -2399,7 +2399,7 @@ exports.saveCache = saveCache;
2399
2399
2400
2400
/***/ }),
2401
2401
2402
- /***/ 123 :
2402
+ /***/ 1598 :
2403
2403
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
2404
2404
2405
2405
@@ -2426,10 +2426,10 @@ const auth_1 = __nccwpck_require__(6931);
2426
2426
const crypto = __importStar(__nccwpck_require__(6113));
2427
2427
const fs = __importStar(__nccwpck_require__(7147));
2428
2428
const 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 );
2433
2433
const versionSalt = '1.0';
2434
2434
function getCacheApiUrl(resource) {
2435
2435
const baseUrl = process.env['ACTIONS_CACHE_URL'] || '';
@@ -2646,7 +2646,7 @@ exports.saveCache = saveCache;
2646
2646
2647
2647
/***/ }),
2648
2648
2649
- /***/ 2018 :
2649
+ /***/ 2707 :
2650
2650
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
2651
2651
2652
2652
@@ -2683,7 +2683,7 @@ const path = __importStar(__nccwpck_require__(1017));
2683
2683
const semver = __importStar(__nccwpck_require__(3496));
2684
2684
const util = __importStar(__nccwpck_require__(3837));
2685
2685
const uuid_1 = __nccwpck_require__(1090);
2686
- const constants_1 = __nccwpck_require__(7810 );
2686
+ const constants_1 = __nccwpck_require__(2114 );
2687
2687
// From https://github.com/actions/toolkit/blob/main/packages/tool-cache/src/tool-cache.ts#L23
2688
2688
function createTempDirectory() {
2689
2689
return __awaiter(this, void 0, void 0, function* () {
@@ -2758,12 +2758,13 @@ function unlinkFile(filePath) {
2758
2758
});
2759
2759
}
2760
2760
exports.unlinkFile = unlinkFile;
2761
- function getVersion(app) {
2761
+ function getVersion(app, additionalArgs = [] ) {
2762
2762
return __awaiter(this, void 0, void 0, function* () {
2763
- core.debug(`Checking ${app} --version`);
2764
2763
let versionOutput = '';
2764
+ additionalArgs.push('--version');
2765
+ core.debug(`Checking ${app} ${additionalArgs.join(' ')}`);
2765
2766
try {
2766
- yield exec.exec(`${app} --version `, [] , {
2767
+ yield exec.exec(`${app}`, additionalArgs , {
2767
2768
ignoreReturnCode: true,
2768
2769
silent: true,
2769
2770
listeners: {
@@ -2783,19 +2784,14 @@ function getVersion(app) {
2783
2784
// Use zstandard if possible to maximize cache performance
2784
2785
function getCompressionMethod() {
2785
2786
return __awaiter(this, void 0, void 0, function* () {
2786
- const versionOutput = yield getVersion('zstd');
2787
+ const versionOutput = yield getVersion('zstd', ['--quiet'] );
2787
2788
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 === '') {
2790
2791
return constants_1.CompressionMethod.Gzip;
2791
2792
}
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
- }
2797
2793
else {
2798
- return constants_1.CompressionMethod.Zstd ;
2794
+ return constants_1.CompressionMethod.ZstdWithoutLong ;
2799
2795
}
2800
2796
});
2801
2797
}
@@ -2832,7 +2828,7 @@ exports.isGhes = isGhes;
2832
2828
2833
2829
/***/ }),
2834
2830
2835
- /***/ 7810 :
2831
+ /***/ 2114 :
2836
2832
/***/ ((__unused_webpack_module, exports) => {
2837
2833
2838
2834
@@ -2873,7 +2869,7 @@ exports.ManifestFilename = 'manifest.txt';
2873
2869
2874
2870
/***/ }),
2875
2871
2876
- /***/ 5634 :
2872
+ /***/ 6898 :
2877
2873
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
2878
2874
2879
2875
@@ -2901,9 +2897,9 @@ const buffer = __importStar(__nccwpck_require__(4300));
2901
2897
const fs = __importStar(__nccwpck_require__(7147));
2902
2898
const stream = __importStar(__nccwpck_require__(2781));
2903
2899
const 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 );
2907
2903
const abort_controller_1 = __nccwpck_require__(4992);
2908
2904
/**
2909
2905
* Pipes the body of a HTTP response to a stream
@@ -3130,7 +3126,7 @@ const promiseWithTimeout = (timeoutMs, promise) => __awaiter(void 0, void 0, voi
3130
3126
3131
3127
/***/ }),
3132
3128
3133
- /***/ 7738 :
3129
+ /***/ 8536 :
3134
3130
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
3135
3131
3136
3132
@@ -3153,7 +3149,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
3153
3149
Object.defineProperty(exports, "__esModule", ({ value: true }));
3154
3150
const core = __importStar(__nccwpck_require__(7733));
3155
3151
const http_client_1 = __nccwpck_require__(3569);
3156
- const constants_1 = __nccwpck_require__(7810 );
3152
+ const constants_1 = __nccwpck_require__(2114 );
3157
3153
function isSuccessStatusCode(statusCode) {
3158
3154
if (!statusCode) {
3159
3155
return false;
@@ -3256,7 +3252,7 @@ exports.retryHttpClientResponse = retryHttpClientResponse;
3256
3252
3257
3253
/***/ }),
3258
3254
3259
- /***/ 7364 :
3255
+ /***/ 973 :
3260
3256
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
3261
3257
3262
3258
@@ -3281,8 +3277,8 @@ const exec_1 = __nccwpck_require__(1757);
3281
3277
const io = __importStar(__nccwpck_require__(1318));
3282
3278
const fs_1 = __nccwpck_require__(7147);
3283
3279
const 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 );
3286
3282
const IS_WINDOWS = process.platform === 'win32';
3287
3283
// Returns tar path and type: BSD or GNU
3288
3284
function getTarPath() {
@@ -3517,7 +3513,7 @@ exports.createTar = createTar;
3517
3513
3518
3514
/***/ }),
3519
3515
3520
- /***/ 7855 :
3516
+ /***/ 4090 :
3521
3517
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
3522
3518
3523
3519
@@ -68421,7 +68417,7 @@ __nccwpck_require__.a(__webpack_module__, async (__webpack_handle_async_dependen
68421
68417
/* harmony import */ var _actions_tool_cache__WEBPACK_IMPORTED_MODULE_0__ = __nccwpck_require__(514);
68422
68418
/* harmony import */ var _actions_artifact__WEBPACK_IMPORTED_MODULE_1__ = __nccwpck_require__(5833);
68423
68419
/* 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 );
68425
68421
68426
68422
68427
68423
0 commit comments