Skip to content

Commit

Permalink
Merge pull request #2 from useblacksmith/bump-version
Browse files Browse the repository at this point in the history 
dist: bump version cache
  • Loading branch information
@adityamaru
adityamaru authored Apr 20, 2024
2 parents d608e9b + b0af321 commit 5d260ed
Show file tree
Hide file tree
Showing 4 changed files with 93 additions and 13 deletions.
48 changes: 44 additions & 4 deletions dist/restore/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,20 @@ function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArch
}
else {
// Supress all non-validation cache related errors because caching should be optional
core.warning(`Failed to restore: ${error.message}`);
if (error.message.includes(`Cache service responded with 404`)) {
core.info(`Did not get a cache hit; proceeding as an uncached run`);
}
else {
core.warning(`Failed to restore: ${error.message}`);
}
}
}
finally {
// Try to delete the archive to save space
try {
yield utils.unlinkFile(archivePath);
const before = Date.now();
yield unlinkWithTimeout(archivePath, 5000);
core.info(`cleaning up archive took ${Date.now() - before}ms`);
}
catch (error) {
core.debug(`Failed to delete archive: ${error}`);
Expand All @@ -159,6 +166,27 @@ function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArch
});
}
exports.restoreCache = restoreCache;
function unlinkWithTimeout(path, timeoutMs) {
return __awaiter(this, void 0, void 0, function* () {
const timeout = new Promise((_, reject) => {
setTimeout(() => {
reject(new Error('Unlink operation timed out'));
}, timeoutMs);
});
try {
yield Promise.race([utils.unlinkFile(path), timeout]);
}
catch (error) {
if (error.message === 'Unlink operation timed out') {
core.warning(`Unlink operation exceeded the timeout of ${timeoutMs}ms`);
}
else {
core.debug(`Failed to delete archive: ${error}`);
}
throw error;
}
});
}
/**
* Saves a list of files with the specified key
*
Expand Down Expand Up @@ -318,7 +346,6 @@ function getRequestOptions() {
}
function createHttpClient() {
const token = process.env['BLACKSMITH_CACHE_TOKEN'];
core.debug(`BLACKSMITH_CACHE_TOKEN: ${token}`);
const bearerCredentialHandler = new auth_1.BearerCredentialHandler(token !== null && token !== void 0 ? token : '');
return new http_client_1.HttpClient('useblacksmith/cache', [bearerCredentialHandler], getRequestOptions());
}
Expand Down Expand Up @@ -992,6 +1019,7 @@ function downloadCacheHttpClient(archiveLocation, archivePath) {
yield fdesc.sync();
progressLogger = new DownloadProgress(fileSize);
progressLogger.startDisplayTimer();
core.info(`Downloading ${archivePath}`);
// Divvy up the download into chunks based on CONCURRENCY
const chunkSize = Math.ceil(fileSize / CONCURRENCY);
const chunkRanges = [];
Expand All @@ -1017,9 +1045,21 @@ function downloadCacheHttpClient(archiveLocation, archivePath) {
}));
yield Promise.all(downloads);
}
catch (err) {
core.warning(`Failed to download cache: ${err}`);
throw err;
}
finally {
yield fdesc.close();
// Stop the progress logger regardless of whether the download succeeded or failed.
// Not doing this will cause the entire action to halt if the download fails.
progressLogger === null || progressLogger === void 0 ? void 0 : progressLogger.stopDisplayTimer();
try {
yield fdesc.close();
}
catch (err) {
// Intentionally swallow any errors in closing the file descriptor.
core.warning(`Failed to close file descriptor: ${err}`);
}
}
});
}
Expand Down
48 changes: 44 additions & 4 deletions dist/save/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,20 @@ function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArch
}
else {
// Supress all non-validation cache related errors because caching should be optional
core.warning(`Failed to restore: ${error.message}`);
if (error.message.includes(`Cache service responded with 404`)) {
core.info(`Did not get a cache hit; proceeding as an uncached run`);
}
else {
core.warning(`Failed to restore: ${error.message}`);
}
}
}
finally {
// Try to delete the archive to save space
try {
yield utils.unlinkFile(archivePath);
const before = Date.now();
yield unlinkWithTimeout(archivePath, 5000);
core.info(`cleaning up archive took ${Date.now() - before}ms`);
}
catch (error) {
core.debug(`Failed to delete archive: ${error}`);
Expand All @@ -159,6 +166,27 @@ function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArch
});
}
exports.restoreCache = restoreCache;
function unlinkWithTimeout(path, timeoutMs) {
return __awaiter(this, void 0, void 0, function* () {
const timeout = new Promise((_, reject) => {
setTimeout(() => {
reject(new Error('Unlink operation timed out'));
}, timeoutMs);
});
try {
yield Promise.race([utils.unlinkFile(path), timeout]);
}
catch (error) {
if (error.message === 'Unlink operation timed out') {
core.warning(`Unlink operation exceeded the timeout of ${timeoutMs}ms`);
}
else {
core.debug(`Failed to delete archive: ${error}`);
}
throw error;
}
});
}
/**
* Saves a list of files with the specified key
*
Expand Down Expand Up @@ -318,7 +346,6 @@ function getRequestOptions() {
}
function createHttpClient() {
const token = process.env['BLACKSMITH_CACHE_TOKEN'];
core.debug(`BLACKSMITH_CACHE_TOKEN: ${token}`);
const bearerCredentialHandler = new auth_1.BearerCredentialHandler(token !== null && token !== void 0 ? token : '');
return new http_client_1.HttpClient('useblacksmith/cache', [bearerCredentialHandler], getRequestOptions());
}
Expand Down Expand Up @@ -992,6 +1019,7 @@ function downloadCacheHttpClient(archiveLocation, archivePath) {
yield fdesc.sync();
progressLogger = new DownloadProgress(fileSize);
progressLogger.startDisplayTimer();
core.info(`Downloading ${archivePath}`);
// Divvy up the download into chunks based on CONCURRENCY
const chunkSize = Math.ceil(fileSize / CONCURRENCY);
const chunkRanges = [];
Expand All @@ -1017,9 +1045,21 @@ function downloadCacheHttpClient(archiveLocation, archivePath) {
}));
yield Promise.all(downloads);
}
catch (err) {
core.warning(`Failed to download cache: ${err}`);
throw err;
}
finally {
yield fdesc.close();
// Stop the progress logger regardless of whether the download succeeded or failed.
// Not doing this will cause the entire action to halt if the download fails.
progressLogger === null || progressLogger === void 0 ? void 0 : progressLogger.stopDisplayTimer();
try {
yield fdesc.close();
}
catch (err) {
// Intentionally swallow any errors in closing the file descriptor.
core.warning(`Failed to close file descriptor: ${err}`);
}
}
});
}
Expand Down
8 changes: 4 additions & 4 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
"homepage": "https://github.com/Swatinem/rust-cache#readme",
"dependencies": {
"@actions/blacksmith-cache": "npm:@useblacksmith/[email protected].41",
"@actions/blacksmith-cache": "npm:@useblacksmith/[email protected].48",
"@actions/buildjet-cache": "npm:[email protected]",
"@actions/cache": "^3.2.3",
"@actions/core": "^1.10.1",
Expand Down

0 comments on commit 5d260ed

Please sign in to comment.