From 0eb01d12a14a745330801985d99ca27cd8293396 Mon Sep 17 00:00:00 2001
From: Napster134 <Napster134@hotmail.com>
Date: Fri, 23 Feb 2024 14:56:53 -0800
Subject: [PATCH] Adjust storage warning
---
dist/restore-only/index.js | 5 +++--
dist/restore/index.js | 5 +++--
dist/save-only/index.js | 5 +++--
dist/save/index.js | 5 +++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js
index d1695d2..d215dd4 100644
--- a/dist/restore-only/index.js
+++ b/dist/restore-only/index.js
@@ -189,12 +189,13 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
if (core.isDebug()) {
yield (0, tar_1.listTar)(archivePath, compressionMethod);
}
- const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
+ const fileSizeMultiplierGb = 10 // 10GB per repo limit
+ const fileSizeLimit = fileSizeMultiplierGb * 1024 * 1024 * 1024;
const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
core.debug(`File Size: ${archiveFileSize}`);
// For GHES, this check will take place in ReserveCache API with enterprise file size limit
if (archiveFileSize > fileSizeLimit && !utils.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 ${fileSizeMultiplierGb}GB limit, not saving cache.`);
}
core.debug('Reserving Cache');
const reserveCacheResponse = yield cacheHttpClient.reserveCache(key, paths, {
diff --git a/dist/restore/index.js b/dist/restore/index.js
index f32c494..d761e93 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -189,12 +189,13 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
if (core.isDebug()) {
yield (0, tar_1.listTar)(archivePath, compressionMethod);
}
- const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
+ const fileSizeMultiplierGb = 10 // 10GB per repo limit
+ const fileSizeLimit = fileSizeMultiplierGb * 1024 * 1024 * 1024;
const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
core.debug(`File Size: ${archiveFileSize}`);
// For GHES, this check will take place in ReserveCache API with enterprise file size limit
if (archiveFileSize > fileSizeLimit && !utils.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 ${fileSizeMultiplierGb}GB limit, not saving cache.`);
}
core.debug('Reserving Cache');
const reserveCacheResponse = yield cacheHttpClient.reserveCache(key, paths, {
diff --git a/dist/save-only/index.js b/dist/save-only/index.js
index e590b47..da969c3 100644
--- a/dist/save-only/index.js
+++ b/dist/save-only/index.js
@@ -189,12 +189,13 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
if (core.isDebug()) {
yield (0, tar_1.listTar)(archivePath, compressionMethod);
}
- const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
+ const fileSizeMultiplierGb = 10 // 10GB per repo limit
+ const fileSizeLimit = fileSizeMultiplierGb * 1024 * 1024 * 1024;
const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
core.debug(`File Size: ${archiveFileSize}`);
// For GHES, this check will take place in ReserveCache API with enterprise file size limit
if (archiveFileSize > fileSizeLimit && !utils.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 ${fileSizeMultiplierGb}GB limit, not saving cache.`);
}
core.debug('Reserving Cache');
const reserveCacheResponse = yield cacheHttpClient.reserveCache(key, paths, {
diff --git a/dist/save/index.js b/dist/save/index.js
index c27f5f8..d2afc35 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -189,12 +189,13 @@ function saveCache(paths, key, options, enableCrossOsArchive = false) {
if (core.isDebug()) {
yield (0, tar_1.listTar)(archivePath, compressionMethod);
}
- const fileSizeLimit = 10 * 1024 * 1024 * 1024; // 10GB per repo limit
+ const fileSizeMultiplierGb = 10 // 10GB per repo limit
+ const fileSizeLimit = fileSizeMultiplierGb * 1024 * 1024 * 1024;
const archiveFileSize = utils.getArchiveFileSizeInBytes(archivePath);
core.debug(`File Size: ${archiveFileSize}`);
// For GHES, this check will take place in ReserveCache API with enterprise file size limit
if (archiveFileSize > fileSizeLimit && !utils.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 ${fileSizeMultiplierGb}GB limit, not saving cache.`);
}
core.debug('Reserving Cache');
const reserveCacheResponse = yield cacheHttpClient.reserveCache(key, paths, {