From d0be34d54485f31ca2ccbe66e6ea3d96544a807b Mon Sep 17 00:00:00 2001
From: Tatyana Kostromskaya <32135588+takost@users.noreply.github.com>
Date: Mon, 15 Jan 2024 14:19:39 +0000
Subject: [PATCH] Fix dist
---
dist/restore-only/index.js | 38 +++++++++++++++++---------------------
dist/restore/index.js | 38 +++++++++++++++++---------------------
dist/save-only/index.js | 38 +++++++++++++++++---------------------
dist/save/index.js | 38 +++++++++++++++++---------------------
4 files changed, 68 insertions(+), 84 deletions(-)
diff --git a/dist/restore-only/index.js b/dist/restore-only/index.js
index 87d16a3..d1695d2 100644
--- a/dist/restore-only/index.js
+++ b/dist/restore-only/index.js
@@ -319,7 +319,8 @@ function createHttpClient() {
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
}
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
- const components = paths;
+ // don't pass changes upstream
+ const components = paths.slice();
// Add compression method to cache version to restore
// compressed cache as per compression method
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
implicitDescendants: false
});
try {
- for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+ for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
_c = _g.value;
_e = false;
- try {
- const file = _c;
- const relativeFile = path
- .relative(workspace, file)
- .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
- core.debug(`Matched: ${relativeFile}`);
- // Paths are made relative so the tar entries are all relative to the root of the workspace.
- if (relativeFile === '') {
- // path.relative returns empty string if workspace and file are equal
- paths.push('.');
- }
- else {
- paths.push(`${relativeFile}`);
- }
+ const file = _c;
+ const relativeFile = path
+ .relative(workspace, file)
+ .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+ core.debug(`Matched: ${relativeFile}`);
+ // Paths are made relative so the tar entries are all relative to the root of the workspace.
+ if (relativeFile === '') {
+ // path.relative returns empty string if workspace and file are equal
+ paths.push('.');
}
- finally {
- _e = true;
+ else {
+ paths.push(`${relativeFile}`);
}
}
}
@@ -729,7 +725,7 @@ var CacheFilename;
(function (CacheFilename) {
CacheFilename["Gzip"] = "cache.tgz";
CacheFilename["Zstd"] = "cache.tzst";
-})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
+})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
var CompressionMethod;
(function (CompressionMethod) {
CompressionMethod["Gzip"] = "gzip";
@@ -737,12 +733,12 @@ var CompressionMethod;
// This enum is for earlier version of zstd that does not have --long support
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
-})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
+})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
var ArchiveToolType;
(function (ArchiveToolType) {
ArchiveToolType["GNU"] = "gnu";
ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
+})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
diff --git a/dist/restore/index.js b/dist/restore/index.js
index aa33df1..f32c494 100644
--- a/dist/restore/index.js
+++ b/dist/restore/index.js
@@ -319,7 +319,8 @@ function createHttpClient() {
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
}
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
- const components = paths;
+ // don't pass changes upstream
+ const components = paths.slice();
// Add compression method to cache version to restore
// compressed cache as per compression method
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
implicitDescendants: false
});
try {
- for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+ for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
_c = _g.value;
_e = false;
- try {
- const file = _c;
- const relativeFile = path
- .relative(workspace, file)
- .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
- core.debug(`Matched: ${relativeFile}`);
- // Paths are made relative so the tar entries are all relative to the root of the workspace.
- if (relativeFile === '') {
- // path.relative returns empty string if workspace and file are equal
- paths.push('.');
- }
- else {
- paths.push(`${relativeFile}`);
- }
+ const file = _c;
+ const relativeFile = path
+ .relative(workspace, file)
+ .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+ core.debug(`Matched: ${relativeFile}`);
+ // Paths are made relative so the tar entries are all relative to the root of the workspace.
+ if (relativeFile === '') {
+ // path.relative returns empty string if workspace and file are equal
+ paths.push('.');
}
- finally {
- _e = true;
+ else {
+ paths.push(`${relativeFile}`);
}
}
}
@@ -729,7 +725,7 @@ var CacheFilename;
(function (CacheFilename) {
CacheFilename["Gzip"] = "cache.tgz";
CacheFilename["Zstd"] = "cache.tzst";
-})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
+})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
var CompressionMethod;
(function (CompressionMethod) {
CompressionMethod["Gzip"] = "gzip";
@@ -737,12 +733,12 @@ var CompressionMethod;
// This enum is for earlier version of zstd that does not have --long support
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
-})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
+})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
var ArchiveToolType;
(function (ArchiveToolType) {
ArchiveToolType["GNU"] = "gnu";
ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
+})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
diff --git a/dist/save-only/index.js b/dist/save-only/index.js
index 4bb48d7..e590b47 100644
--- a/dist/save-only/index.js
+++ b/dist/save-only/index.js
@@ -319,7 +319,8 @@ function createHttpClient() {
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
}
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
- const components = paths;
+ // don't pass changes upstream
+ const components = paths.slice();
// Add compression method to cache version to restore
// compressed cache as per compression method
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
implicitDescendants: false
});
try {
- for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+ for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
_c = _g.value;
_e = false;
- try {
- const file = _c;
- const relativeFile = path
- .relative(workspace, file)
- .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
- core.debug(`Matched: ${relativeFile}`);
- // Paths are made relative so the tar entries are all relative to the root of the workspace.
- if (relativeFile === '') {
- // path.relative returns empty string if workspace and file are equal
- paths.push('.');
- }
- else {
- paths.push(`${relativeFile}`);
- }
+ const file = _c;
+ const relativeFile = path
+ .relative(workspace, file)
+ .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+ core.debug(`Matched: ${relativeFile}`);
+ // Paths are made relative so the tar entries are all relative to the root of the workspace.
+ if (relativeFile === '') {
+ // path.relative returns empty string if workspace and file are equal
+ paths.push('.');
}
- finally {
- _e = true;
+ else {
+ paths.push(`${relativeFile}`);
}
}
}
@@ -729,7 +725,7 @@ var CacheFilename;
(function (CacheFilename) {
CacheFilename["Gzip"] = "cache.tgz";
CacheFilename["Zstd"] = "cache.tzst";
-})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
+})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
var CompressionMethod;
(function (CompressionMethod) {
CompressionMethod["Gzip"] = "gzip";
@@ -737,12 +733,12 @@ var CompressionMethod;
// This enum is for earlier version of zstd that does not have --long support
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
-})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
+})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
var ArchiveToolType;
(function (ArchiveToolType) {
ArchiveToolType["GNU"] = "gnu";
ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
+})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.
diff --git a/dist/save/index.js b/dist/save/index.js
index 0c2a02e..c27f5f8 100644
--- a/dist/save/index.js
+++ b/dist/save/index.js
@@ -319,7 +319,8 @@ function createHttpClient() {
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
}
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
- const components = paths;
+ // don't pass changes upstream
+ const components = paths.slice();
// Add compression method to cache version to restore
// compressed cache as per compression method
if (compressionMethod) {
@@ -608,26 +609,21 @@ function resolvePaths(patterns) {
implicitDescendants: false
});
try {
- for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+ for (var _e = true, _f = __asyncValues(globber.globGenerator()), _g; _g = yield _f.next(), _a = _g.done, !_a; _e = true) {
_c = _g.value;
_e = false;
- try {
- const file = _c;
- const relativeFile = path
- .relative(workspace, file)
- .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
- core.debug(`Matched: ${relativeFile}`);
- // Paths are made relative so the tar entries are all relative to the root of the workspace.
- if (relativeFile === '') {
- // path.relative returns empty string if workspace and file are equal
- paths.push('.');
- }
- else {
- paths.push(`${relativeFile}`);
- }
+ const file = _c;
+ const relativeFile = path
+ .relative(workspace, file)
+ .replace(new RegExp(`\\${path.sep}`, 'g'), '/');
+ core.debug(`Matched: ${relativeFile}`);
+ // Paths are made relative so the tar entries are all relative to the root of the workspace.
+ if (relativeFile === '') {
+ // path.relative returns empty string if workspace and file are equal
+ paths.push('.');
}
- finally {
- _e = true;
+ else {
+ paths.push(`${relativeFile}`);
}
}
}
@@ -729,7 +725,7 @@ var CacheFilename;
(function (CacheFilename) {
CacheFilename["Gzip"] = "cache.tgz";
CacheFilename["Zstd"] = "cache.tzst";
-})(CacheFilename = exports.CacheFilename || (exports.CacheFilename = {}));
+})(CacheFilename || (exports.CacheFilename = CacheFilename = {}));
var CompressionMethod;
(function (CompressionMethod) {
CompressionMethod["Gzip"] = "gzip";
@@ -737,12 +733,12 @@ var CompressionMethod;
// This enum is for earlier version of zstd that does not have --long support
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
CompressionMethod["Zstd"] = "zstd";
-})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
+})(CompressionMethod || (exports.CompressionMethod = CompressionMethod = {}));
var ArchiveToolType;
(function (ArchiveToolType) {
ArchiveToolType["GNU"] = "gnu";
ArchiveToolType["BSD"] = "bsd";
-})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
+})(ArchiveToolType || (exports.ArchiveToolType = ArchiveToolType = {}));
// The default number of retry attempts.
exports.DefaultRetryAttempts = 2;
// The default delay in milliseconds between retry attempts.