@actions/cache 3.1.0 → 3.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cache.d.ts +4 -2
- package/lib/cache.js +11 -23
- package/lib/cache.js.map +1 -1
- package/lib/internal/cacheHttpClient.d.ts +1 -1
- package/lib/internal/cacheHttpClient.js +13 -7
- package/lib/internal/cacheHttpClient.js.map +1 -1
- package/lib/internal/tar.js +2 -0
- package/lib/internal/tar.js.map +1 -1
- package/package.json +1 -1
package/lib/cache.d.ts
CHANGED
|
@@ -18,15 +18,17 @@ export declare function isFeatureAvailable(): boolean;
|
|
|
18
18
|
* @param primaryKey an explicit key for restoring the cache
|
|
19
19
|
* @param restoreKeys an optional ordered list of keys to use for restoring the cache if no cache hit occurred for key
|
|
20
20
|
* @param downloadOptions cache download options
|
|
21
|
+
* @param enableCrossOsArchive an optional boolean enabled to restore on windows any cache created on any platform
|
|
21
22
|
* @returns string returns the key for the cache hit, otherwise returns undefined
|
|
22
23
|
*/
|
|
23
|
-
export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions): Promise<string | undefined>;
|
|
24
|
+
export declare function restoreCache(paths: string[], primaryKey: string, restoreKeys?: string[], options?: DownloadOptions, enableCrossOsArchive?: boolean): Promise<string | undefined>;
|
|
24
25
|
/**
|
|
25
26
|
* Saves a list of files with the specified key
|
|
26
27
|
*
|
|
27
28
|
* @param paths a list of file paths to be cached
|
|
28
29
|
* @param key an explicit key for restoring the cache
|
|
30
|
+
* @param enableCrossOsArchive an optional boolean enabled to save cache on windows which could be restored on any platform
|
|
29
31
|
* @param options cache upload options
|
|
30
32
|
* @returns number returns cacheId if the cache was saved successfully and throws an error if save fails
|
|
31
33
|
*/
|
|
32
|
-
export declare function saveCache(paths: string[], key: string, options?: UploadOptions): Promise<number>;
|
|
34
|
+
export declare function saveCache(paths: string[], key: string, options?: UploadOptions, enableCrossOsArchive?: boolean): Promise<number>;
|
package/lib/cache.js
CHANGED
|
@@ -21,7 +21,6 @@ const path = __importStar(require("path"));
|
|
|
21
21
|
const utils = __importStar(require("./internal/cacheUtils"));
|
|
22
22
|
const cacheHttpClient = __importStar(require("./internal/cacheHttpClient"));
|
|
23
23
|
const tar_1 = require("./internal/tar");
|
|
24
|
-
const constants_1 = require("./internal/constants");
|
|
25
24
|
class ValidationError extends Error {
|
|
26
25
|
constructor(message) {
|
|
27
26
|
super(message);
|
|
@@ -68,9 +67,10 @@ exports.isFeatureAvailable = isFeatureAvailable;
|
|
|
68
67
|
* @param primaryKey an explicit key for restoring the cache
|
|
69
68
|
* @param restoreKeys an optional ordered list of keys to use for restoring the cache if no cache hit occurred for key
|
|
70
69
|
* @param downloadOptions cache download options
|
|
70
|
+
* @param enableCrossOsArchive an optional boolean enabled to restore on windows any cache created on any platform
|
|
71
71
|
* @returns string returns the key for the cache hit, otherwise returns undefined
|
|
72
72
|
*/
|
|
73
|
-
function restoreCache(paths, primaryKey, restoreKeys, options) {
|
|
73
|
+
function restoreCache(paths, primaryKey, restoreKeys, options, enableCrossOsArchive = false) {
|
|
74
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
75
|
checkPaths(paths);
|
|
76
76
|
restoreKeys = restoreKeys || [];
|
|
@@ -83,31 +83,17 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
|
|
|
83
83
|
for (const key of keys) {
|
|
84
84
|
checkKey(key);
|
|
85
85
|
}
|
|
86
|
-
|
|
87
|
-
let compressionMethod = yield utils.getCompressionMethod();
|
|
86
|
+
const compressionMethod = yield utils.getCompressionMethod();
|
|
88
87
|
let archivePath = '';
|
|
89
88
|
try {
|
|
90
89
|
// path are needed to compute version
|
|
91
|
-
cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
|
|
92
|
-
compressionMethod
|
|
90
|
+
const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
|
|
91
|
+
compressionMethod,
|
|
92
|
+
enableCrossOsArchive
|
|
93
93
|
});
|
|
94
94
|
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
|
|
95
|
-
//
|
|
96
|
-
|
|
97
|
-
compressionMethod !== constants_1.CompressionMethod.Gzip) {
|
|
98
|
-
compressionMethod = constants_1.CompressionMethod.Gzip;
|
|
99
|
-
cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
|
|
100
|
-
compressionMethod
|
|
101
|
-
});
|
|
102
|
-
if (!(cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.archiveLocation)) {
|
|
103
|
-
return undefined;
|
|
104
|
-
}
|
|
105
|
-
core.info("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
// Cache not found
|
|
109
|
-
return undefined;
|
|
110
|
-
}
|
|
95
|
+
// Cache not found
|
|
96
|
+
return undefined;
|
|
111
97
|
}
|
|
112
98
|
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
|
|
113
99
|
core.debug(`Archive Path: ${archivePath}`);
|
|
@@ -150,10 +136,11 @@ exports.restoreCache = restoreCache;
|
|
|
150
136
|
*
|
|
151
137
|
* @param paths a list of file paths to be cached
|
|
152
138
|
* @param key an explicit key for restoring the cache
|
|
139
|
+
* @param enableCrossOsArchive an optional boolean enabled to save cache on windows which could be restored on any platform
|
|
153
140
|
* @param options cache upload options
|
|
154
141
|
* @returns number returns cacheId if the cache was saved successfully and throws an error if save fails
|
|
155
142
|
*/
|
|
156
|
-
function saveCache(paths, key, options) {
|
|
143
|
+
function saveCache(paths, key, options, enableCrossOsArchive = false) {
|
|
157
144
|
var _a, _b, _c, _d, _e;
|
|
158
145
|
return __awaiter(this, void 0, void 0, function* () {
|
|
159
146
|
checkPaths(paths);
|
|
@@ -184,6 +171,7 @@ function saveCache(paths, key, options) {
|
|
|
184
171
|
core.debug('Reserving Cache');
|
|
185
172
|
const reserveCacheResponse = yield cacheHttpClient.reserveCache(key, paths, {
|
|
186
173
|
compressionMethod,
|
|
174
|
+
enableCrossOsArchive,
|
|
187
175
|
cacheSize: archiveFileSize
|
|
188
176
|
});
|
|
189
177
|
if ((_a = reserveCacheResponse === null || reserveCacheResponse === void 0 ? void 0 : reserveCacheResponse.result) === null || _a === void 0 ? void 0 : _a.cacheId) {
|
package/lib/cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAqC;AACrC,2CAA4B;AAC5B,6DAA8C;AAC9C,4EAA6D;AAC7D,wCAA6D;
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../src/cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { CompressionMethod } from './constants';
|
|
2
2
|
import { ArtifactCacheEntry, InternalCacheOptions, ReserveCacheResponse, ITypedResponseWithError } from './contracts';
|
|
3
3
|
import { DownloadOptions, UploadOptions } from '../options';
|
|
4
|
-
export declare function getCacheVersion(paths: string[], compressionMethod?: CompressionMethod): string;
|
|
4
|
+
export declare function getCacheVersion(paths: string[], compressionMethod?: CompressionMethod, enableCrossOsArchive?: boolean): string;
|
|
5
5
|
export declare function getCacheEntry(keys: string[], paths: string[], options?: InternalCacheOptions): Promise<ArtifactCacheEntry | null>;
|
|
6
6
|
export declare function downloadCache(archiveLocation: string, archivePath: string, options?: DownloadOptions): Promise<void>;
|
|
7
7
|
export declare function reserveCache(key: string, paths: string[], options?: InternalCacheOptions): Promise<ITypedResponseWithError<ReserveCacheResponse>>;
|
|
@@ -23,7 +23,6 @@ const crypto = __importStar(require("crypto"));
|
|
|
23
23
|
const fs = __importStar(require("fs"));
|
|
24
24
|
const url_1 = require("url");
|
|
25
25
|
const utils = __importStar(require("./cacheUtils"));
|
|
26
|
-
const constants_1 = require("./constants");
|
|
27
26
|
const downloadUtils_1 = require("./downloadUtils");
|
|
28
27
|
const options_1 = require("../options");
|
|
29
28
|
const requestUtils_1 = require("./requestUtils");
|
|
@@ -53,10 +52,17 @@ function createHttpClient() {
|
|
|
53
52
|
const bearerCredentialHandler = new auth_1.BearerCredentialHandler(token);
|
|
54
53
|
return new http_client_1.HttpClient('actions/cache', [bearerCredentialHandler], getRequestOptions());
|
|
55
54
|
}
|
|
56
|
-
function getCacheVersion(paths, compressionMethod) {
|
|
57
|
-
const components = paths
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
function getCacheVersion(paths, compressionMethod, enableCrossOsArchive = false) {
|
|
56
|
+
const components = paths;
|
|
57
|
+
// Add compression method to cache version to restore
|
|
58
|
+
// compressed cache as per compression method
|
|
59
|
+
if (compressionMethod) {
|
|
60
|
+
components.push(compressionMethod);
|
|
61
|
+
}
|
|
62
|
+
// Only check for windows platforms if enableCrossOsArchive is false
|
|
63
|
+
if (process.platform === 'win32' && !enableCrossOsArchive) {
|
|
64
|
+
components.push('windows-only');
|
|
65
|
+
}
|
|
60
66
|
// Add salt to cache version to support breaking changes in cache entry
|
|
61
67
|
components.push(versionSalt);
|
|
62
68
|
return crypto
|
|
@@ -68,7 +74,7 @@ exports.getCacheVersion = getCacheVersion;
|
|
|
68
74
|
function getCacheEntry(keys, paths, options) {
|
|
69
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
70
76
|
const httpClient = createHttpClient();
|
|
71
|
-
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod);
|
|
77
|
+
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod, options === null || options === void 0 ? void 0 : options.enableCrossOsArchive);
|
|
72
78
|
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
|
|
73
79
|
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
|
|
74
80
|
// Cache not found
|
|
@@ -131,7 +137,7 @@ exports.downloadCache = downloadCache;
|
|
|
131
137
|
function reserveCache(key, paths, options) {
|
|
132
138
|
return __awaiter(this, void 0, void 0, function* () {
|
|
133
139
|
const httpClient = createHttpClient();
|
|
134
|
-
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod);
|
|
140
|
+
const version = getCacheVersion(paths, options === null || options === void 0 ? void 0 : options.compressionMethod, options === null || options === void 0 ? void 0 : options.enableCrossOsArchive);
|
|
135
141
|
const reserveCacheRequest = {
|
|
136
142
|
key,
|
|
137
143
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheHttpClient.js","sourceRoot":"","sources":["../../src/internal/cacheHttpClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,oDAAqC;AACrC,sDAA+C;AAC/C,wDAAqE;AAKrE,+CAAgC;AAChC,uCAAwB;AACxB,6BAAuB;AAEvB,oDAAqC;
|
|
1
|
+
{"version":3,"file":"cacheHttpClient.js","sourceRoot":"","sources":["../../src/internal/cacheHttpClient.ts"],"names":[],"mappings":"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"}
|
package/lib/internal/tar.js
CHANGED
|
@@ -17,12 +17,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
17
17
|
};
|
|
18
18
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
19
19
|
const exec_1 = require("@actions/exec");
|
|
20
|
+
const core_1 = require("@actions/core");
|
|
20
21
|
const io = __importStar(require("@actions/io"));
|
|
21
22
|
const fs_1 = require("fs");
|
|
22
23
|
const path = __importStar(require("path"));
|
|
23
24
|
const utils = __importStar(require("./cacheUtils"));
|
|
24
25
|
const constants_1 = require("./constants");
|
|
25
26
|
const IS_WINDOWS = process.platform === 'win32';
|
|
27
|
+
core_1.exportVariable('MSYS', 'winsymlinks:nativestrict');
|
|
26
28
|
// Returns tar path and type: BSD or GNU
|
|
27
29
|
function getTarPath() {
|
|
28
30
|
return __awaiter(this, void 0, void 0, function* () {
|
package/lib/internal/tar.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tar.js","sourceRoot":"","sources":["../../src/internal/tar.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,wCAAkC;AAClC,gDAAiC;AACjC,2BAA4C;AAC5C,2CAA4B;AAC5B,oDAAqC;AAErC,2CAMoB;AAEpB,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"tar.js","sourceRoot":"","sources":["../../src/internal/tar.ts"],"names":[],"mappings":"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"}
|