Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 45f413a

Browse filesBrowse files
github-actions[bot]adityamaru
github-actions[bot]
authored and
adityamaru
committed
Bump @actions/cache version to 3.2.212
1 parent 93c7917 commit 45f413a
Copy full SHA for 45f413a

File tree

Expand file treeCollapse file tree

4 files changed

+11
-61
lines changed
Filter options
Expand file treeCollapse file tree

4 files changed

+11
-61
lines changed

‎dist/cache-save/index.js

Copy file name to clipboardExpand all lines: dist/cache-save/index.js
-30Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
365365
step((generator = generator.apply(thisArg, _arguments || [])).next());
366366
});
367367
};
368-
var __importDefault = (this && this.__importDefault) || function (mod) {
369-
return (mod && mod.__esModule) ? mod : { "default": mod };
370-
};
371368
Object.defineProperty(exports, "__esModule", ({ value: true }));
372369
exports.saveCache = exports.reserveCache = exports.downloadCache = exports.getCacheEntry = exports.getCacheEntryUsingCacheMgr = exports.downloadBlobUsingCacheMgr = exports.waitForArchiveToBeAvailable = exports.mountSharedNFSVolume = exports.getCacheVersion = exports.createHttpClient = exports.getCacheApiUrl = void 0;
373370
const core = __importStar(__nccwpck_require__(2186));
@@ -380,12 +377,8 @@ const utils = __importStar(__nccwpck_require__(1518));
380377
const downloadUtils_1 = __nccwpck_require__(5500);
381378
const options_1 = __nccwpck_require__(6215);
382379
const requestUtils_1 = __nccwpck_require__(3981);
383-
<<<<<<< HEAD
384380
const axios_1 = __importStar(__nccwpck_require__(8757));
385381
const child_process_1 = __nccwpck_require__(2081);
386-
=======
387-
const axios_1 = __importDefault(__nccwpck_require__(8757));
388-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
389382
const versionSalt = '1.0';
390383
function getCacheApiUrl(resource) {
391384
var _a, _b;
@@ -577,11 +570,7 @@ function getCacheEntry(keys, paths, options) {
577570
return __awaiter(this, void 0, void 0, function* () {
578571
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod, options === null || options === void 0 ? void 0 : options.enableCrossOsArchive);
579572
const resource = `?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
580-
<<<<<<< HEAD
581573
const maxRetries = 3;
582-
=======
583-
const maxRetries = 2;
584-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
585574
let retries = 0;
586575
core.info(`Checking cache for keys ${keys.join(',')} and version ${version}`);
587576
while (retries <= maxRetries) {
@@ -591,16 +580,10 @@ function getCacheEntry(keys, paths, options) {
591580
headers: {
592581
Accept: createAcceptHeader('application/json', '6.0-preview.1'),
593582
'X-Github-Repo-Name': process.env['GITHUB_REPO_NAME'],
594-
<<<<<<< HEAD
595583
Authorization: `Bearer ${process.env['BLACKSMITH_CACHE_TOKEN']}`,
596584
'X-Cache-Region': (_a = process.env['BLACKSMITH_REGION']) !== null && _a !== void 0 ? _a : 'eu-central'
597585
},
598586
timeout: 3000 // 3 seconds timeout
599-
=======
600-
Authorization: `Bearer ${process.env['BLACKSMITH_CACHE_TOKEN']}`
601-
},
602-
timeout: 10000 // 10 seconds timeout
603-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
604587
});
605588
core.debug(`Cache lookup took ${Date.now() - before}ms`);
606589
// Cache not found
@@ -626,7 +609,6 @@ function getCacheEntry(keys, paths, options) {
626609
return cacheResult;
627610
}
628611
catch (error) {
629-
<<<<<<< HEAD
630612
if ((error.response && error.response.status >= 500) ||
631613
error.code === 'ECONNABORTED') {
632614
retries++;
@@ -639,24 +621,12 @@ function getCacheEntry(keys, paths, options) {
639621
}
640622
continue;
641623
}
642-
=======
643-
if (error.response &&
644-
error.response.status >= 500 &&
645-
retries < maxRetries) {
646-
retries++;
647-
core.warning(`Retrying due to server error (attempt ${retries} of ${maxRetries})`);
648-
continue;
649-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
650624
}
651625
if (error.response) {
652626
throw new Error(`Cache service responded with ${error.response.status}`);
653627
}
654628
else if (error.code === 'ECONNABORTED') {
655-
<<<<<<< HEAD
656629
throw new Error('Request timed out after 3 seconds');
657-
=======
658-
throw new Error('Request timed out after 10 seconds');
659-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
660630
}
661631
else {
662632
throw error;

‎dist/setup/index.js

Copy file name to clipboardExpand all lines: dist/setup/index.js
-30Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -365,9 +365,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
365365
step((generator = generator.apply(thisArg, _arguments || [])).next());
366366
});
367367
};
368-
var __importDefault = (this && this.__importDefault) || function (mod) {
369-
return (mod && mod.__esModule) ? mod : { "default": mod };
370-
};
371368
Object.defineProperty(exports, "__esModule", ({ value: true }));
372369
exports.saveCache = exports.reserveCache = exports.downloadCache = exports.getCacheEntry = exports.getCacheEntryUsingCacheMgr = exports.downloadBlobUsingCacheMgr = exports.waitForArchiveToBeAvailable = exports.mountSharedNFSVolume = exports.getCacheVersion = exports.createHttpClient = exports.getCacheApiUrl = void 0;
373370
const core = __importStar(__nccwpck_require__(2186));
@@ -380,12 +377,8 @@ const utils = __importStar(__nccwpck_require__(1518));
380377
const downloadUtils_1 = __nccwpck_require__(5500);
381378
const options_1 = __nccwpck_require__(6215);
382379
const requestUtils_1 = __nccwpck_require__(3981);
383-
<<<<<<< HEAD
384380
const axios_1 = __importStar(__nccwpck_require__(8757));
385381
const child_process_1 = __nccwpck_require__(2081);
386-
=======
387-
const axios_1 = __importDefault(__nccwpck_require__(8757));
388-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
389382
const versionSalt = '1.0';
390383
function getCacheApiUrl(resource) {
391384
var _a, _b;
@@ -577,11 +570,7 @@ function getCacheEntry(keys, paths, options) {
577570
return __awaiter(this, void 0, void 0, function* () {
578571
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod, options === null || options === void 0 ? void 0 : options.enableCrossOsArchive);
579572
const resource = `?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
580-
<<<<<<< HEAD
581573
const maxRetries = 3;
582-
=======
583-
const maxRetries = 2;
584-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
585574
let retries = 0;
586575
core.info(`Checking cache for keys ${keys.join(',')} and version ${version}`);
587576
while (retries <= maxRetries) {
@@ -591,16 +580,10 @@ function getCacheEntry(keys, paths, options) {
591580
headers: {
592581
Accept: createAcceptHeader('application/json', '6.0-preview.1'),
593582
'X-Github-Repo-Name': process.env['GITHUB_REPO_NAME'],
594-
<<<<<<< HEAD
595583
Authorization: `Bearer ${process.env['BLACKSMITH_CACHE_TOKEN']}`,
596584
'X-Cache-Region': (_a = process.env['BLACKSMITH_REGION']) !== null && _a !== void 0 ? _a : 'eu-central'
597585
},
598586
timeout: 3000 // 3 seconds timeout
599-
=======
600-
Authorization: `Bearer ${process.env['BLACKSMITH_CACHE_TOKEN']}`
601-
},
602-
timeout: 10000 // 10 seconds timeout
603-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
604587
});
605588
core.debug(`Cache lookup took ${Date.now() - before}ms`);
606589
// Cache not found
@@ -626,7 +609,6 @@ function getCacheEntry(keys, paths, options) {
626609
return cacheResult;
627610
}
628611
catch (error) {
629-
<<<<<<< HEAD
630612
if ((error.response && error.response.status >= 500) ||
631613
error.code === 'ECONNABORTED') {
632614
retries++;
@@ -639,24 +621,12 @@ function getCacheEntry(keys, paths, options) {
639621
}
640622
continue;
641623
}
642-
=======
643-
if (error.response &&
644-
error.response.status >= 500 &&
645-
retries < maxRetries) {
646-
retries++;
647-
core.warning(`Retrying due to server error (attempt ${retries} of ${maxRetries})`);
648-
continue;
649-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
650624
}
651625
if (error.response) {
652626
throw new Error(`Cache service responded with ${error.response.status}`);
653627
}
654628
else if (error.code === 'ECONNABORTED') {
655-
<<<<<<< HEAD
656629
throw new Error('Request timed out after 3 seconds');
657-
=======
658-
throw new Error('Request timed out after 10 seconds');
659-
>>>>>>> 86f6ba1 (Bump @actions/cache version to 3.2.158)
660630
}
661631
else {
662632
throw error;

‎package-lock.json

Copy file name to clipboardExpand all lines: package-lock.json
+10Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Copy file name to clipboardExpand all lines: package.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"author": "GitHub",
2626
"license": "MIT",
2727
"dependencies": {
28-
"@actions/cache": "npm:@useblacksmith/cache@3.2.158",
28+
"@actions/cache": "npm:@useblacksmith/cache@3.2.212",
2929
"@actions/core": "^1.10.0",
3030
"@actions/exec": "^1.1.0",
3131
"@actions/glob": "^0.5.0",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.