Gitea/cache
1
0
Fork 0
mirror of https://github.com/actions/cache.git synced 2025-11-03 23:28:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix upload progress bug

Browse Source
This commit is contained in:
Bassem Dghaidi 2024-12-02 03:56:52 -08:00 committed by GitHub
parent ac6da278d8
commit 1b2fea8bc3
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/restore-only/index.js vendored
View File

@ -6255,6 +6255,9 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) { if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) {
throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`); throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`);
} }
// Set the archive size in the options, will be used to display the upload
// progress
options.archiveSizeBytes = archiveFileSize;
core.debug('Reserving Cache'); core.debug('Reserving Cache');
const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive); const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive);
const request = { const request = {
@ -6288,7 +6291,6 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
core.info(`Failed to save: ${typedError.message}`); core.info(`Failed to save: ${typedError.message}`);
} }
else { else {
core.warning(`Failed to save: ${typedError.stack}`);
core.warning(`Failed to save: ${typedError.message}`); core.warning(`Failed to save: ${typedError.message}`);
} }
} }
@ -9825,12 +9827,11 @@ class UploadProgress {
} }
exports.UploadProgress = UploadProgress; exports.UploadProgress = UploadProgress;
function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) { function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const blobClient = new storage_blob_1.BlobClient(signedUploadURL); const blobClient = new storage_blob_1.BlobClient(signedUploadURL);
const blockBlobClient = blobClient.getBlockBlobClient(); const blockBlobClient = blobClient.getBlockBlobClient();
// const properties = await blobClient.getProperties() const uploadProgress = new UploadProgress((_a = options === null || options === void 0 ? void 0 : options.archiveSizeBytes) !== null && _a !== void 0 ? _a : 0);
// const contentLength = properties.contentLength ?? -1
const uploadProgress = new UploadProgress(100 * 1024 * 1024);
// Specify data transfer options // Specify data transfer options
const uploadOptions = { const uploadOptions = {
blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize, blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize,
@ -9849,7 +9850,7 @@ function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
return response; return response;
} }
catch (error) { catch (error) {
core.debug(`Error uploading cache archive: ${error}`); core.warning(`uploadCacheArchiveSDK: internal error uploading cache archive: ${error.message}`);
throw error; throw error;
} }
finally { finally {

11
dist/restore/index.js vendored
View File

@ -6255,6 +6255,9 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) { if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) {
throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`); throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`);
} }
// Set the archive size in the options, will be used to display the upload
// progress
options.archiveSizeBytes = archiveFileSize;
core.debug('Reserving Cache'); core.debug('Reserving Cache');
const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive); const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive);
const request = { const request = {
@ -6288,7 +6291,6 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
core.info(`Failed to save: ${typedError.message}`); core.info(`Failed to save: ${typedError.message}`);
} }
else { else {
core.warning(`Failed to save: ${typedError.stack}`);
core.warning(`Failed to save: ${typedError.message}`); core.warning(`Failed to save: ${typedError.message}`);
} }
} }
@ -9825,12 +9827,11 @@ class UploadProgress {
} }
exports.UploadProgress = UploadProgress; exports.UploadProgress = UploadProgress;
function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) { function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const blobClient = new storage_blob_1.BlobClient(signedUploadURL); const blobClient = new storage_blob_1.BlobClient(signedUploadURL);
const blockBlobClient = blobClient.getBlockBlobClient(); const blockBlobClient = blobClient.getBlockBlobClient();
// const properties = await blobClient.getProperties() const uploadProgress = new UploadProgress((_a = options === null || options === void 0 ? void 0 : options.archiveSizeBytes) !== null && _a !== void 0 ? _a : 0);
// const contentLength = properties.contentLength ?? -1
const uploadProgress = new UploadProgress(100 * 1024 * 1024);
// Specify data transfer options // Specify data transfer options
const uploadOptions = { const uploadOptions = {
blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize, blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize,
@ -9849,7 +9850,7 @@ function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
return response; return response;
} }
catch (error) { catch (error) {
core.debug(`Error uploading cache archive: ${error}`); core.warning(`uploadCacheArchiveSDK: internal error uploading cache archive: ${error.message}`);
throw error; throw error;
} }
finally { finally {

11
dist/save-only/index.js vendored
View File

@ -6255,6 +6255,9 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) { if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) {
throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`); throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`);
} }
// Set the archive size in the options, will be used to display the upload
// progress
options.archiveSizeBytes = archiveFileSize;
core.debug('Reserving Cache'); core.debug('Reserving Cache');
const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive); const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive);
const request = { const request = {
@ -6288,7 +6291,6 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
core.info(`Failed to save: ${typedError.message}`); core.info(`Failed to save: ${typedError.message}`);
} }
else { else {
core.warning(`Failed to save: ${typedError.stack}`);
core.warning(`Failed to save: ${typedError.message}`); core.warning(`Failed to save: ${typedError.message}`);
} }
} }
@ -9825,12 +9827,11 @@ class UploadProgress {
} }
exports.UploadProgress = UploadProgress; exports.UploadProgress = UploadProgress;
function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) { function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const blobClient = new storage_blob_1.BlobClient(signedUploadURL); const blobClient = new storage_blob_1.BlobClient(signedUploadURL);
const blockBlobClient = blobClient.getBlockBlobClient(); const blockBlobClient = blobClient.getBlockBlobClient();
// const properties = await blobClient.getProperties() const uploadProgress = new UploadProgress((_a = options === null || options === void 0 ? void 0 : options.archiveSizeBytes) !== null && _a !== void 0 ? _a : 0);
// const contentLength = properties.contentLength ?? -1
const uploadProgress = new UploadProgress(100 * 1024 * 1024);
// Specify data transfer options // Specify data transfer options
const uploadOptions = { const uploadOptions = {
blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize, blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize,
@ -9849,7 +9850,7 @@ function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
return response; return response;
} }
catch (error) { catch (error) {
core.debug(`Error uploading cache archive: ${error}`); core.warning(`uploadCacheArchiveSDK: internal error uploading cache archive: ${error.message}`);
throw error; throw error;
} }
finally { finally {

11
dist/save/index.js vendored
View File

@ -6255,6 +6255,9 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) { if (archiveFileSize > constants_1.CacheFileSizeLimit && !(0, config_1.isGhes)()) {
throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`); throw new Error(`Cache size of ~${Math.round(archiveFileSize / (1024 * 1024))} MB (${archiveFileSize} B) is over the 10GB limit, not saving cache.`);
} }
// Set the archive size in the options, will be used to display the upload
// progress
options.archiveSizeBytes = archiveFileSize;
core.debug('Reserving Cache'); core.debug('Reserving Cache');
const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive); const version = utils.getCacheVersion(paths, compressionMethod, enableCrossOsArchive);
const request = { const request = {
@ -6288,7 +6291,6 @@ function saveCacheV2(paths, key, options, enableCrossOsArchive = false) {
core.info(`Failed to save: ${typedError.message}`); core.info(`Failed to save: ${typedError.message}`);
} }
else { else {
core.warning(`Failed to save: ${typedError.stack}`);
core.warning(`Failed to save: ${typedError.message}`); core.warning(`Failed to save: ${typedError.message}`);
} }
} }
@ -9825,12 +9827,11 @@ class UploadProgress {
} }
exports.UploadProgress = UploadProgress; exports.UploadProgress = UploadProgress;
function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) { function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
var _a;
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
const blobClient = new storage_blob_1.BlobClient(signedUploadURL); const blobClient = new storage_blob_1.BlobClient(signedUploadURL);
const blockBlobClient = blobClient.getBlockBlobClient(); const blockBlobClient = blobClient.getBlockBlobClient();
// const properties = await blobClient.getProperties() const uploadProgress = new UploadProgress((_a = options === null || options === void 0 ? void 0 : options.archiveSizeBytes) !== null && _a !== void 0 ? _a : 0);
// const contentLength = properties.contentLength ?? -1
const uploadProgress = new UploadProgress(100 * 1024 * 1024);
// Specify data transfer options // Specify data transfer options
const uploadOptions = { const uploadOptions = {
blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize, blockSize: options === null || options === void 0 ? void 0 : options.uploadChunkSize,
@ -9849,7 +9850,7 @@ function uploadCacheArchiveSDK(signedUploadURL, archivePath, options) {
return response; return response;
} }
catch (error) { catch (error) {
core.debug(`Error uploading cache archive: ${error}`); core.warning(`uploadCacheArchiveSDK: internal error uploading cache archive: ${error.message}`);
throw error; throw error;
} }
finally { finally {