@actions/cache 3.1.0-beta.3 → 3.1.1
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.js +4 -20
- package/lib/cache.js.map +1 -1
- package/lib/internal/cacheHttpClient.js +20 -2
- package/lib/internal/cacheHttpClient.js.map +1 -1
- package/lib/internal/cacheUtils.d.ts +1 -1
- package/lib/internal/cacheUtils.js +7 -6
- package/lib/internal/cacheUtils.js.map +1 -1
- package/lib/internal/constants.d.ts +0 -8
- package/lib/internal/constants.js +0 -11
- package/lib/internal/constants.js.map +1 -1
- package/lib/internal/tar.js +87 -177
- package/lib/internal/tar.js.map +1 -1
- package/package.json +1 -1
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);
|
|
@@ -83,31 +82,16 @@ function restoreCache(paths, primaryKey, restoreKeys, options) {
|
|
|
83
82
|
for (const key of keys) {
|
|
84
83
|
checkKey(key);
|
|
85
84
|
}
|
|
86
|
-
|
|
87
|
-
let compressionMethod = yield utils.getCompressionMethod();
|
|
85
|
+
const compressionMethod = yield utils.getCompressionMethod();
|
|
88
86
|
let archivePath = '';
|
|
89
87
|
try {
|
|
90
88
|
// path are needed to compute version
|
|
91
|
-
cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
|
|
89
|
+
const cacheEntry = yield cacheHttpClient.getCacheEntry(keys, paths, {
|
|
92
90
|
compressionMethod
|
|
93
91
|
});
|
|
94
92
|
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.debug("Couldn't find cache entry with zstd compression, falling back to gzip compression.");
|
|
106
|
-
}
|
|
107
|
-
else {
|
|
108
|
-
// Cache not found
|
|
109
|
-
return undefined;
|
|
110
|
-
}
|
|
93
|
+
// Cache not found
|
|
94
|
+
return undefined;
|
|
111
95
|
}
|
|
112
96
|
archivePath = path.join(yield utils.createTempDirectory(), utils.getCacheFileName(compressionMethod));
|
|
113
97
|
core.debug(`Archive Path: ${archivePath}`);
|
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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"}
|
|
@@ -72,7 +72,10 @@ function getCacheEntry(keys, paths, options) {
|
|
|
72
72
|
const resource = `cache?keys=${encodeURIComponent(keys.join(','))}&version=${version}`;
|
|
73
73
|
const response = yield requestUtils_1.retryTypedResponse('getCacheEntry', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
|
|
74
74
|
if (response.statusCode === 204) {
|
|
75
|
-
//
|
|
75
|
+
// List cache for primary key only if cache miss occurs
|
|
76
|
+
if (core.isDebug()) {
|
|
77
|
+
yield printCachesListForDiagnostics(keys[0], httpClient, version);
|
|
78
|
+
}
|
|
76
79
|
return null;
|
|
77
80
|
}
|
|
78
81
|
if (!requestUtils_1.isSuccessStatusCode(response.statusCode)) {
|
|
@@ -81,7 +84,6 @@ function getCacheEntry(keys, paths, options) {
|
|
|
81
84
|
const cacheResult = response.result;
|
|
82
85
|
const cacheDownloadUrl = cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.archiveLocation;
|
|
83
86
|
if (!cacheDownloadUrl) {
|
|
84
|
-
// Cache achiveLocation not found. This should never happen, and hence bail out.
|
|
85
87
|
throw new Error('Cache not found.');
|
|
86
88
|
}
|
|
87
89
|
core.setSecret(cacheDownloadUrl);
|
|
@@ -91,6 +93,22 @@ function getCacheEntry(keys, paths, options) {
|
|
|
91
93
|
});
|
|
92
94
|
}
|
|
93
95
|
exports.getCacheEntry = getCacheEntry;
|
|
96
|
+
function printCachesListForDiagnostics(key, httpClient, version) {
|
|
97
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
98
|
+
const resource = `caches?key=${encodeURIComponent(key)}`;
|
|
99
|
+
const response = yield requestUtils_1.retryTypedResponse('listCache', () => __awaiter(this, void 0, void 0, function* () { return httpClient.getJson(getCacheApiUrl(resource)); }));
|
|
100
|
+
if (response.statusCode === 200) {
|
|
101
|
+
const cacheListResult = response.result;
|
|
102
|
+
const totalCount = cacheListResult === null || cacheListResult === void 0 ? void 0 : cacheListResult.totalCount;
|
|
103
|
+
if (totalCount && totalCount > 0) {
|
|
104
|
+
core.debug(`No matching cache found for cache key '${key}', version '${version} and scope ${process.env['GITHUB_REF']}. There exist one or more cache(s) with similar key but they have different version or scope. See more info on cache matching here: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#matching-a-cache-key \nOther caches with similar key:`);
|
|
105
|
+
for (const cacheEntry of (cacheListResult === null || cacheListResult === void 0 ? void 0 : cacheListResult.artifactCaches) || []) {
|
|
106
|
+
core.debug(`Cache Key: ${cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.cacheKey}, Cache Version: ${cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.cacheVersion}, Cache Scope: ${cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.scope}, Cache Created: ${cacheEntry === null || cacheEntry === void 0 ? void 0 : cacheEntry.creationTime}`);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}
|
|
94
112
|
function downloadCache(archiveLocation, archivePath, options) {
|
|
95
113
|
return __awaiter(this, void 0, void 0, function* () {
|
|
96
114
|
const archiveUrl = new url_1.URL(archiveLocation);
|
|
@@ -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;AACrC,2CAA6C;
|
|
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;AACrC,2CAA6C;AAU7C,mDAAgF;AAChF,wCAKmB;AACnB,iDAIuB;AAEvB,MAAM,WAAW,GAAG,KAAK,CAAA;AAEzB,SAAS,cAAc,CAAC,QAAgB;IACtC,MAAM,OAAO,GAAW,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAA;IAC9D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAA;KACzE;IAED,MAAM,GAAG,GAAG,GAAG,OAAO,uBAAuB,QAAQ,EAAE,CAAA;IACvD,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAA;IAClC,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,SAAS,kBAAkB,CAAC,IAAY,EAAE,UAAkB;IAC1D,OAAO,GAAG,IAAI,gBAAgB,UAAU,EAAE,CAAA;AAC5C,CAAC;AAED,SAAS,iBAAiB;IACxB,MAAM,cAAc,GAAmB;QACrC,OAAO,EAAE;YACP,MAAM,EAAE,kBAAkB,CAAC,kBAAkB,EAAE,eAAe,CAAC;SAChE;KACF,CAAA;IAED,OAAO,cAAc,CAAA;AACvB,CAAC;AAED,SAAS,gBAAgB;IACvB,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,IAAI,EAAE,CAAA;IACxD,MAAM,uBAAuB,GAAG,IAAI,8BAAuB,CAAC,KAAK,CAAC,CAAA;IAElE,OAAO,IAAI,wBAAU,CACnB,eAAe,EACf,CAAC,uBAAuB,CAAC,EACzB,iBAAiB,EAAE,CACpB,CAAA;AACH,CAAC;AAED,SAAgB,eAAe,CAC7B,KAAe,EACf,iBAAqC;IAErC,MAAM,UAAU,GAAG,KAAK,CAAC,MAAM,CAC7B,CAAC,iBAAiB,IAAI,iBAAiB,KAAK,6BAAiB,CAAC,IAAI;QAChE,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CACxB,CAAA;IAED,uEAAuE;IACvE,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IAE5B,OAAO,MAAM;SACV,UAAU,CAAC,QAAQ,CAAC;SACpB,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC5B,MAAM,CAAC,KAAK,CAAC,CAAA;AAClB,CAAC;AAjBD,0CAiBC;AAED,SAAsB,aAAa,CACjC,IAAc,EACd,KAAe,EACf,OAA8B;;QAE9B,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAA;QACrC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAC,CAAA;QAClE,MAAM,QAAQ,GAAG,cAAc,kBAAkB,CAC/C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CACf,YAAY,OAAO,EAAE,CAAA;QAEtB,MAAM,QAAQ,GAAG,MAAM,iCAAkB,CAAC,eAAe,EAAE,GAAS,EAAE,gDACpE,OAAA,UAAU,CAAC,OAAO,CAAqB,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAA,GAAA,CACjE,CAAA;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;YAC/B,uDAAuD;YACvD,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE;gBAClB,MAAM,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,CAAA;aAClE;YACD,OAAO,IAAI,CAAA;SACZ;QACD,IAAI,CAAC,kCAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;SACvE;QAED,MAAM,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAA;QACnC,MAAM,gBAAgB,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,CAAA;QACrD,IAAI,CAAC,gBAAgB,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;SACpC;QACD,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;QAChC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAA;QAC3B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;QAEvC,OAAO,WAAW,CAAA;IACpB,CAAC;CAAA;AAnCD,sCAmCC;AAED,SAAe,6BAA6B,CAC1C,GAAW,EACX,UAAsB,EACtB,OAAe;;QAEf,MAAM,QAAQ,GAAG,cAAc,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAA;QACxD,MAAM,QAAQ,GAAG,MAAM,iCAAkB,CAAC,WAAW,EAAE,GAAS,EAAE,gDAChE,OAAA,UAAU,CAAC,OAAO,CAAoB,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAA,GAAA,CAChE,CAAA;QACD,IAAI,QAAQ,CAAC,UAAU,KAAK,GAAG,EAAE;YAC/B,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,CAAA;YACvC,MAAM,UAAU,GAAG,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,UAAU,CAAA;YAC9C,IAAI,UAAU,IAAI,UAAU,GAAG,CAAC,EAAE;gBAChC,IAAI,CAAC,KAAK,CACR,0CAA0C,GAAG,eAAe,OAAO,cAAc,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,yRAAyR,CACpY,CAAA;gBACD,KAAK,MAAM,UAAU,IAAI,CAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,cAAc,KAAI,EAAE,EAAE;oBAC9D,IAAI,CAAC,KAAK,CACR,cAAc,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,oBAAoB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,kBAAkB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,oBAAoB,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,YAAY,EAAE,CAChK,CAAA;iBACF;aACF;SACF;IACH,CAAC;CAAA;AAED,SAAsB,aAAa,CACjC,eAAuB,EACvB,WAAmB,EACnB,OAAyB;;QAEzB,MAAM,UAAU,GAAG,IAAI,SAAG,CAAC,eAAe,CAAC,CAAA;QAC3C,MAAM,eAAe,GAAG,4BAAkB,CAAC,OAAO,CAAC,CAAA;QAEnD,IACE,eAAe,CAAC,WAAW;YAC3B,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC,EACtD;YACA,6FAA6F;YAC7F,MAAM,uCAAuB,CAAC,eAAe,EAAE,WAAW,EAAE,eAAe,CAAC,CAAA;SAC7E;aAAM;YACL,qDAAqD;YACrD,MAAM,uCAAuB,CAAC,eAAe,EAAE,WAAW,CAAC,CAAA;SAC5D;IACH,CAAC;CAAA;AAlBD,sCAkBC;AAED,gBAAgB;AAChB,SAAsB,YAAY,CAChC,GAAW,EACX,KAAe,EACf,OAA8B;;QAE9B,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAA;QACrC,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,iBAAiB,CAAC,CAAA;QAElE,MAAM,mBAAmB,GAAwB;YAC/C,GAAG;YACH,OAAO;YACP,SAAS,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;SAC9B,CAAA;QACD,MAAM,QAAQ,GAAG,MAAM,iCAAkB,CAAC,cAAc,EAAE,GAAS,EAAE;YACnE,OAAA,UAAU,CAAC,QAAQ,CACjB,cAAc,CAAC,QAAQ,CAAC,EACxB,mBAAmB,CACpB,CAAA;UAAA,CACF,CAAA;QACD,OAAO,QAAQ,CAAA;IACjB,CAAC;CAAA;AApBD,oCAoBC;AAED,SAAS,eAAe,CAAC,KAAa,EAAE,GAAW;IACjD,oCAAoC;IACpC,8BAA8B;IAC9B,oBAAoB;IACpB,2CAA2C;IAC3C,+BAA+B;IAC/B,OAAO,SAAS,KAAK,IAAI,GAAG,IAAI,CAAA;AAClC,CAAC;AAED,SAAe,WAAW,CACxB,UAAsB,EACtB,WAAmB,EACnB,UAAuC,EACvC,KAAa,EACb,GAAW;;QAEX,IAAI,CAAC,KAAK,CACR,2BAA2B,GAAG;YAC5B,KAAK;YACL,CAAC,oBAAoB,KAAK,wBAAwB,eAAe,CACjE,KAAK,EACL,GAAG,CACJ,EAAE,CACJ,CAAA;QACD,MAAM,iBAAiB,GAAG;YACxB,cAAc,EAAE,0BAA0B;YAC1C,eAAe,EAAE,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC;SAC7C,CAAA;QAED,MAAM,mBAAmB,GAAG,MAAM,sCAAuB,CACvD,uBAAuB,KAAK,UAAU,GAAG,GAAG,EAC5C,GAAS,EAAE;YACT,OAAA,UAAU,CAAC,UAAU,CACnB,OAAO,EACP,WAAW,EACX,UAAU,EAAE,EACZ,iBAAiB,CAClB,CAAA;UAAA,CACJ,CAAA;QAED,IAAI,CAAC,kCAAmB,CAAC,mBAAmB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YAChE,MAAM,IAAI,KAAK,CACb,gCAAgC,mBAAmB,CAAC,OAAO,CAAC,UAAU,uBAAuB,CAC9F,CAAA;SACF;IACH,CAAC;CAAA;AAED,SAAe,UAAU,CACvB,UAAsB,EACtB,OAAe,EACf,WAAmB,EACnB,OAAuB;;QAEvB,gBAAgB;QAChB,MAAM,QAAQ,GAAG,KAAK,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAA;QAC7D,MAAM,WAAW,GAAG,cAAc,CAAC,UAAU,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;QAClE,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,CAAA;QACxC,MAAM,aAAa,GAAG,0BAAgB,CAAC,OAAO,CAAC,CAAA;QAE/C,MAAM,WAAW,GAAG,KAAK,CAAC,aAAa,CACrC,mBAAmB,EACnB,aAAa,CAAC,iBAAiB,CAChC,CAAA;QACD,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CACtC,iBAAiB,EACjB,aAAa,CAAC,eAAe,CAC9B,CAAA;QAED,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,CAAC,CAAA;QAC1D,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAA;QAClC,IAAI,MAAM,GAAG,CAAC,CAAA;QAEd,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CACf,eAAe,CAAC,GAAG,CAAC,GAAS,EAAE;gBAC7B,OAAO,MAAM,GAAG,QAAQ,EAAE;oBACxB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,MAAM,EAAE,YAAY,CAAC,CAAA;oBAC3D,MAAM,KAAK,GAAG,MAAM,CAAA;oBACpB,MAAM,GAAG,GAAG,MAAM,GAAG,SAAS,GAAG,CAAC,CAAA;oBAClC,MAAM,IAAI,YAAY,CAAA;oBAEtB,MAAM,WAAW,CACf,UAAU,EACV,WAAW,EACX,GAAG,EAAE,CACH,EAAE;yBACC,gBAAgB,CAAC,WAAW,EAAE;wBAC7B,EAAE;wBACF,KAAK;wBACL,GAAG;wBACH,SAAS,EAAE,KAAK;qBACjB,CAAC;yBACD,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;wBACnB,MAAM,IAAI,KAAK,CACb,qDAAqD,KAAK,CAAC,OAAO,EAAE,CACrE,CAAA;oBACH,CAAC,CAAC,EACN,KAAK,EACL,GAAG,CACJ,CAAA;iBACF;YACH,CAAC,CAAA,CAAC,CACH,CAAA;SACF;gBAAS;YACR,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA;SACjB;QACD,OAAM;IACR,CAAC;CAAA;AAED,SAAe,WAAW,CACxB,UAAsB,EACtB,OAAe,EACf,QAAgB;;QAEhB,MAAM,kBAAkB,GAAuB,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAA;QAC/D,OAAO,MAAM,iCAAkB,CAAC,aAAa,EAAE,GAAS,EAAE;YACxD,OAAA,UAAU,CAAC,QAAQ,CACjB,cAAc,CAAC,UAAU,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,EAC9C,kBAAkB,CACnB,CAAA;UAAA,CACF,CAAA;IACH,CAAC;CAAA;AAED,SAAsB,SAAS,CAC7B,OAAe,EACf,WAAmB,EACnB,OAAuB;;QAEvB,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAA;QAErC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAC1B,MAAM,UAAU,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAA;QAE3D,eAAe;QACf,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAA;QAC7B,MAAM,SAAS,GAAG,KAAK,CAAC,yBAAyB,CAAC,WAAW,CAAC,CAAA;QAC9D,IAAI,CAAC,IAAI,CACP,gBAAgB,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,QAAQ,SAAS,KAAK,CAC5E,CAAA;QAED,MAAM,mBAAmB,GAAG,MAAM,WAAW,CAAC,UAAU,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;QAC7E,IAAI,CAAC,kCAAmB,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;YACxD,MAAM,IAAI,KAAK,CACb,gCAAgC,mBAAmB,CAAC,UAAU,uBAAuB,CACtF,CAAA;SACF;QAED,IAAI,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;IACvC,CAAC;CAAA;AAzBD,8BAyBC"}
|
|
@@ -7,6 +7,6 @@ export declare function resolvePaths(patterns: string[]): Promise<string[]>;
|
|
|
7
7
|
export declare function unlinkFile(filePath: fs.PathLike): Promise<void>;
|
|
8
8
|
export declare function getCompressionMethod(): Promise<CompressionMethod>;
|
|
9
9
|
export declare function getCacheFileName(compressionMethod: CompressionMethod): string;
|
|
10
|
-
export declare function
|
|
10
|
+
export declare function isGnuTarInstalled(): Promise<boolean>;
|
|
11
11
|
export declare function assertDefined<T>(name: string, value?: T): T;
|
|
12
12
|
export declare function isGhes(): boolean;
|
|
@@ -132,6 +132,10 @@ function getVersion(app) {
|
|
|
132
132
|
// Use zstandard if possible to maximize cache performance
|
|
133
133
|
function getCompressionMethod() {
|
|
134
134
|
return __awaiter(this, void 0, void 0, function* () {
|
|
135
|
+
if (process.platform === 'win32' && !(yield isGnuTarInstalled())) {
|
|
136
|
+
// Disable zstd due to bug https://github.com/actions/cache/issues/301
|
|
137
|
+
return constants_1.CompressionMethod.Gzip;
|
|
138
|
+
}
|
|
135
139
|
const versionOutput = yield getVersion('zstd');
|
|
136
140
|
const version = semver.clean(versionOutput);
|
|
137
141
|
if (!versionOutput.toLowerCase().includes('zstd command line interface')) {
|
|
@@ -155,16 +159,13 @@ function getCacheFileName(compressionMethod) {
|
|
|
155
159
|
: constants_1.CacheFilename.Zstd;
|
|
156
160
|
}
|
|
157
161
|
exports.getCacheFileName = getCacheFileName;
|
|
158
|
-
function
|
|
162
|
+
function isGnuTarInstalled() {
|
|
159
163
|
return __awaiter(this, void 0, void 0, function* () {
|
|
160
|
-
if (fs.existsSync(constants_1.GnuTarPathOnWindows)) {
|
|
161
|
-
return constants_1.GnuTarPathOnWindows;
|
|
162
|
-
}
|
|
163
164
|
const versionOutput = yield getVersion('tar');
|
|
164
|
-
return versionOutput.toLowerCase().includes('gnu tar')
|
|
165
|
+
return versionOutput.toLowerCase().includes('gnu tar');
|
|
165
166
|
});
|
|
166
167
|
}
|
|
167
|
-
exports.
|
|
168
|
+
exports.isGnuTarInstalled = isGnuTarInstalled;
|
|
168
169
|
function assertDefined(name, value) {
|
|
169
170
|
if (value === undefined) {
|
|
170
171
|
throw Error(`Expected ${name} but value was undefiend`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cacheUtils.js","sourceRoot":"","sources":["../../src/internal/cacheUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAAqC;AACrC,oDAAqC;AACrC,oDAAqC;AACrC,gDAAiC;AACjC,uCAAwB;AACxB,2CAA4B;AAC5B,+CAAgC;AAChC,2CAA4B;AAC5B,+BAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"cacheUtils.js","sourceRoot":"","sources":["../../src/internal/cacheUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,14 +7,6 @@ export declare enum CompressionMethod {
|
|
|
7
7
|
ZstdWithoutLong = "zstd-without-long",
|
|
8
8
|
Zstd = "zstd"
|
|
9
9
|
}
|
|
10
|
-
export declare enum ArchiveToolType {
|
|
11
|
-
GNU = "gnu",
|
|
12
|
-
BSD = "bsd"
|
|
13
|
-
}
|
|
14
10
|
export declare const DefaultRetryAttempts = 2;
|
|
15
11
|
export declare const DefaultRetryDelay = 5000;
|
|
16
12
|
export declare const SocketTimeout = 5000;
|
|
17
|
-
export declare const GnuTarPathOnWindows: string;
|
|
18
|
-
export declare const SystemTarPathOnWindows: string;
|
|
19
|
-
export declare const TarFilename = "cache.tar";
|
|
20
|
-
export declare const ManifestFilename = "manifest.txt";
|
|
@@ -13,11 +13,6 @@ var CompressionMethod;
|
|
|
13
13
|
CompressionMethod["ZstdWithoutLong"] = "zstd-without-long";
|
|
14
14
|
CompressionMethod["Zstd"] = "zstd";
|
|
15
15
|
})(CompressionMethod = exports.CompressionMethod || (exports.CompressionMethod = {}));
|
|
16
|
-
var ArchiveToolType;
|
|
17
|
-
(function (ArchiveToolType) {
|
|
18
|
-
ArchiveToolType["GNU"] = "gnu";
|
|
19
|
-
ArchiveToolType["BSD"] = "bsd";
|
|
20
|
-
})(ArchiveToolType = exports.ArchiveToolType || (exports.ArchiveToolType = {}));
|
|
21
16
|
// The default number of retry attempts.
|
|
22
17
|
exports.DefaultRetryAttempts = 2;
|
|
23
18
|
// The default delay in milliseconds between retry attempts.
|
|
@@ -26,10 +21,4 @@ exports.DefaultRetryDelay = 5000;
|
|
|
26
21
|
// over the socket during this period, the socket is destroyed and the download
|
|
27
22
|
// is aborted.
|
|
28
23
|
exports.SocketTimeout = 5000;
|
|
29
|
-
// The default path of GNUtar on hosted Windows runners
|
|
30
|
-
exports.GnuTarPathOnWindows = `${process.env['PROGRAMFILES']}\\Git\\usr\\bin\\tar.exe`;
|
|
31
|
-
// The default path of BSDtar on hosted Windows runners
|
|
32
|
-
exports.SystemTarPathOnWindows = `${process.env['SYSTEMDRIVE']}\\Windows\\System32\\tar.exe`;
|
|
33
|
-
exports.TarFilename = 'cache.tar';
|
|
34
|
-
exports.ManifestFilename = 'manifest.txt';
|
|
35
24
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/internal/constants.ts"],"names":[],"mappings":";;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mCAAkB,CAAA;IAClB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,+CAA+C;IAC/C,6EAA6E;IAC7E,0DAAqC,CAAA;IACrC,kCAAa,CAAA;AACf,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B;AAED,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/internal/constants.ts"],"names":[],"mappings":";;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,mCAAkB,CAAA;IAClB,oCAAmB,CAAA;AACrB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB;AAED,IAAY,iBAMX;AAND,WAAY,iBAAiB;IAC3B,kCAAa,CAAA;IACb,+CAA+C;IAC/C,6EAA6E;IAC7E,0DAAqC,CAAA;IACrC,kCAAa,CAAA;AACf,CAAC,EANW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAM5B;AAED,wCAAwC;AAC3B,QAAA,oBAAoB,GAAG,CAAC,CAAA;AAErC,4DAA4D;AAC/C,QAAA,iBAAiB,GAAG,IAAI,CAAA;AAErC,6EAA6E;AAC7E,+EAA+E;AAC/E,cAAc;AACD,QAAA,aAAa,GAAG,IAAI,CAAA"}
|
package/lib/internal/tar.js
CHANGED
|
@@ -23,19 +23,21 @@ const path = __importStar(require("path"));
|
|
|
23
23
|
const utils = __importStar(require("./cacheUtils"));
|
|
24
24
|
const constants_1 = require("./constants");
|
|
25
25
|
const IS_WINDOWS = process.platform === 'win32';
|
|
26
|
-
|
|
27
|
-
function getTarPath() {
|
|
26
|
+
function getTarPath(args, compressionMethod) {
|
|
28
27
|
return __awaiter(this, void 0, void 0, function* () {
|
|
29
28
|
switch (process.platform) {
|
|
30
29
|
case 'win32': {
|
|
31
|
-
const
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
//
|
|
35
|
-
|
|
30
|
+
const systemTar = `${process.env['windir']}\\System32\\tar.exe`;
|
|
31
|
+
if (compressionMethod !== constants_1.CompressionMethod.Gzip) {
|
|
32
|
+
// We only use zstandard compression on windows when gnu tar is installed due to
|
|
33
|
+
// a bug with compressing large files with bsdtar + zstd
|
|
34
|
+
args.push('--force-local');
|
|
36
35
|
}
|
|
37
36
|
else if (fs_1.existsSync(systemTar)) {
|
|
38
|
-
return
|
|
37
|
+
return systemTar;
|
|
38
|
+
}
|
|
39
|
+
else if (yield utils.isGnuTarInstalled()) {
|
|
40
|
+
args.push('--force-local');
|
|
39
41
|
}
|
|
40
42
|
break;
|
|
41
43
|
}
|
|
@@ -43,92 +45,25 @@ function getTarPath() {
|
|
|
43
45
|
const gnuTar = yield io.which('gtar', false);
|
|
44
46
|
if (gnuTar) {
|
|
45
47
|
// fix permission denied errors when extracting BSD tar archive with GNU tar - https://github.com/actions/cache/issues/527
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
else {
|
|
49
|
-
return {
|
|
50
|
-
path: yield io.which('tar', true),
|
|
51
|
-
type: constants_1.ArchiveToolType.BSD
|
|
52
|
-
};
|
|
48
|
+
args.push('--delay-directory-restore');
|
|
49
|
+
return gnuTar;
|
|
53
50
|
}
|
|
51
|
+
break;
|
|
54
52
|
}
|
|
55
53
|
default:
|
|
56
54
|
break;
|
|
57
55
|
}
|
|
58
|
-
|
|
59
|
-
return {
|
|
60
|
-
path: yield io.which('tar', true),
|
|
61
|
-
type: constants_1.ArchiveToolType.GNU
|
|
62
|
-
};
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
// Return arguments for tar as per tarPath, compressionMethod, method type and os
|
|
66
|
-
function getTarArgs(tarPath, compressionMethod, type, archivePath = '') {
|
|
67
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
68
|
-
const args = [`"${tarPath.path}"`];
|
|
69
|
-
const cacheFileName = utils.getCacheFileName(compressionMethod);
|
|
70
|
-
const tarFile = 'cache.tar';
|
|
71
|
-
const workingDirectory = getWorkingDirectory();
|
|
72
|
-
// Speficic args for BSD tar on windows for workaround
|
|
73
|
-
const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
|
|
74
|
-
compressionMethod !== constants_1.CompressionMethod.Gzip &&
|
|
75
|
-
IS_WINDOWS;
|
|
76
|
-
// Method specific args
|
|
77
|
-
switch (type) {
|
|
78
|
-
case 'create':
|
|
79
|
-
args.push('--posix', '-cf', BSD_TAR_ZSTD
|
|
80
|
-
? tarFile
|
|
81
|
-
: cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--exclude', BSD_TAR_ZSTD
|
|
82
|
-
? tarFile
|
|
83
|
-
: cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '--files-from', constants_1.ManifestFilename);
|
|
84
|
-
break;
|
|
85
|
-
case 'extract':
|
|
86
|
-
args.push('-xf', BSD_TAR_ZSTD
|
|
87
|
-
? tarFile
|
|
88
|
-
: archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P', '-C', workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'));
|
|
89
|
-
break;
|
|
90
|
-
case 'list':
|
|
91
|
-
args.push('-tf', BSD_TAR_ZSTD
|
|
92
|
-
? tarFile
|
|
93
|
-
: archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'), '-P');
|
|
94
|
-
break;
|
|
95
|
-
}
|
|
96
|
-
// Platform specific args
|
|
97
|
-
if (tarPath.type === constants_1.ArchiveToolType.GNU) {
|
|
98
|
-
switch (process.platform) {
|
|
99
|
-
case 'win32':
|
|
100
|
-
args.push('--force-local');
|
|
101
|
-
break;
|
|
102
|
-
case 'darwin':
|
|
103
|
-
args.push('--delay-directory-restore');
|
|
104
|
-
break;
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
return args;
|
|
56
|
+
return yield io.which('tar', true);
|
|
108
57
|
});
|
|
109
58
|
}
|
|
110
|
-
|
|
111
|
-
function getCommands(compressionMethod, type, archivePath = '') {
|
|
59
|
+
function execTar(args, compressionMethod, cwd) {
|
|
112
60
|
return __awaiter(this, void 0, void 0, function* () {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
const tarArgs = yield getTarArgs(tarPath, compressionMethod, type, archivePath);
|
|
116
|
-
const compressionArgs = type !== 'create'
|
|
117
|
-
? yield getDecompressionProgram(tarPath, compressionMethod, archivePath)
|
|
118
|
-
: yield getCompressionProgram(tarPath, compressionMethod);
|
|
119
|
-
const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
|
|
120
|
-
compressionMethod !== constants_1.CompressionMethod.Gzip &&
|
|
121
|
-
IS_WINDOWS;
|
|
122
|
-
if (BSD_TAR_ZSTD && type !== 'create') {
|
|
123
|
-
args = [[...compressionArgs].join(' '), [...tarArgs].join(' ')];
|
|
61
|
+
try {
|
|
62
|
+
yield exec_1.exec(`"${yield getTarPath(args, compressionMethod)}"`, args, { cwd });
|
|
124
63
|
}
|
|
125
|
-
|
|
126
|
-
|
|
64
|
+
catch (error) {
|
|
65
|
+
throw new Error(`Tar failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
|
|
127
66
|
}
|
|
128
|
-
if (BSD_TAR_ZSTD) {
|
|
129
|
-
return args;
|
|
130
|
-
}
|
|
131
|
-
return [args.join(' ')];
|
|
132
67
|
});
|
|
133
68
|
}
|
|
134
69
|
function getWorkingDirectory() {
|
|
@@ -136,116 +71,91 @@ function getWorkingDirectory() {
|
|
|
136
71
|
return (_a = process.env['GITHUB_WORKSPACE']) !== null && _a !== void 0 ? _a : process.cwd();
|
|
137
72
|
}
|
|
138
73
|
// Common function for extractTar and listTar to get the compression method
|
|
139
|
-
function
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
]
|
|
156
|
-
: [
|
|
157
|
-
'--use-compress-program',
|
|
158
|
-
IS_WINDOWS ? '"zstd -d --long=30"' : 'unzstd --long=30'
|
|
159
|
-
];
|
|
160
|
-
case constants_1.CompressionMethod.ZstdWithoutLong:
|
|
161
|
-
return BSD_TAR_ZSTD
|
|
162
|
-
? [
|
|
163
|
-
'zstd -d -o',
|
|
164
|
-
constants_1.TarFilename,
|
|
165
|
-
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
|
|
166
|
-
]
|
|
167
|
-
: ['--use-compress-program', IS_WINDOWS ? '"zstd -d"' : 'unzstd'];
|
|
168
|
-
default:
|
|
169
|
-
return ['-z'];
|
|
170
|
-
}
|
|
171
|
-
});
|
|
74
|
+
function getCompressionProgram(compressionMethod) {
|
|
75
|
+
// -d: Decompress.
|
|
76
|
+
// unzstd is equivalent to 'zstd -d'
|
|
77
|
+
// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
|
|
78
|
+
// Using 30 here because we also support 32-bit self-hosted runners.
|
|
79
|
+
switch (compressionMethod) {
|
|
80
|
+
case constants_1.CompressionMethod.Zstd:
|
|
81
|
+
return [
|
|
82
|
+
'--use-compress-program',
|
|
83
|
+
IS_WINDOWS ? 'zstd -d --long=30' : 'unzstd --long=30'
|
|
84
|
+
];
|
|
85
|
+
case constants_1.CompressionMethod.ZstdWithoutLong:
|
|
86
|
+
return ['--use-compress-program', IS_WINDOWS ? 'zstd -d' : 'unzstd'];
|
|
87
|
+
default:
|
|
88
|
+
return ['-z'];
|
|
89
|
+
}
|
|
172
90
|
}
|
|
173
|
-
// Used for creating the archive
|
|
174
|
-
// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
|
|
175
|
-
// zstdmt is equivalent to 'zstd -T0'
|
|
176
|
-
// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
|
|
177
|
-
// Using 30 here because we also support 32-bit self-hosted runners.
|
|
178
|
-
// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
|
|
179
|
-
function getCompressionProgram(tarPath, compressionMethod) {
|
|
180
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
181
|
-
const cacheFileName = utils.getCacheFileName(compressionMethod);
|
|
182
|
-
const BSD_TAR_ZSTD = tarPath.type === constants_1.ArchiveToolType.BSD &&
|
|
183
|
-
compressionMethod !== constants_1.CompressionMethod.Gzip &&
|
|
184
|
-
IS_WINDOWS;
|
|
185
|
-
switch (compressionMethod) {
|
|
186
|
-
case constants_1.CompressionMethod.Zstd:
|
|
187
|
-
return BSD_TAR_ZSTD
|
|
188
|
-
? [
|
|
189
|
-
'zstd -T0 --long=30 -o',
|
|
190
|
-
cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
191
|
-
constants_1.TarFilename
|
|
192
|
-
]
|
|
193
|
-
: [
|
|
194
|
-
'--use-compress-program',
|
|
195
|
-
IS_WINDOWS ? '"zstd -T0 --long=30"' : 'zstdmt --long=30'
|
|
196
|
-
];
|
|
197
|
-
case constants_1.CompressionMethod.ZstdWithoutLong:
|
|
198
|
-
return BSD_TAR_ZSTD
|
|
199
|
-
? [
|
|
200
|
-
'zstd -T0 -o',
|
|
201
|
-
cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
202
|
-
constants_1.TarFilename
|
|
203
|
-
]
|
|
204
|
-
: ['--use-compress-program', IS_WINDOWS ? '"zstd -T0"' : 'zstdmt'];
|
|
205
|
-
default:
|
|
206
|
-
return ['-z'];
|
|
207
|
-
}
|
|
208
|
-
});
|
|
209
|
-
}
|
|
210
|
-
// Executes all commands as separate processes
|
|
211
|
-
function execCommands(commands, cwd) {
|
|
212
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
213
|
-
for (const command of commands) {
|
|
214
|
-
try {
|
|
215
|
-
yield exec_1.exec(command, undefined, { cwd });
|
|
216
|
-
}
|
|
217
|
-
catch (error) {
|
|
218
|
-
throw new Error(`${command.split(' ')[0]} failed with error: ${error === null || error === void 0 ? void 0 : error.message}`);
|
|
219
|
-
}
|
|
220
|
-
}
|
|
221
|
-
});
|
|
222
|
-
}
|
|
223
|
-
// List the contents of a tar
|
|
224
91
|
function listTar(archivePath, compressionMethod) {
|
|
225
92
|
return __awaiter(this, void 0, void 0, function* () {
|
|
226
|
-
const
|
|
227
|
-
|
|
93
|
+
const args = [
|
|
94
|
+
...getCompressionProgram(compressionMethod),
|
|
95
|
+
'-tf',
|
|
96
|
+
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
97
|
+
'-P'
|
|
98
|
+
];
|
|
99
|
+
yield execTar(args, compressionMethod);
|
|
228
100
|
});
|
|
229
101
|
}
|
|
230
102
|
exports.listTar = listTar;
|
|
231
|
-
// Extract a tar
|
|
232
103
|
function extractTar(archivePath, compressionMethod) {
|
|
233
104
|
return __awaiter(this, void 0, void 0, function* () {
|
|
234
105
|
// Create directory to extract tar into
|
|
235
106
|
const workingDirectory = getWorkingDirectory();
|
|
236
107
|
yield io.mkdirP(workingDirectory);
|
|
237
|
-
const
|
|
238
|
-
|
|
108
|
+
const args = [
|
|
109
|
+
...getCompressionProgram(compressionMethod),
|
|
110
|
+
'-xf',
|
|
111
|
+
archivePath.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
112
|
+
'-P',
|
|
113
|
+
'-C',
|
|
114
|
+
workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/')
|
|
115
|
+
];
|
|
116
|
+
yield execTar(args, compressionMethod);
|
|
239
117
|
});
|
|
240
118
|
}
|
|
241
119
|
exports.extractTar = extractTar;
|
|
242
|
-
// Create a tar
|
|
243
120
|
function createTar(archiveFolder, sourceDirectories, compressionMethod) {
|
|
244
121
|
return __awaiter(this, void 0, void 0, function* () {
|
|
245
122
|
// Write source directories to manifest.txt to avoid command length limits
|
|
246
|
-
|
|
247
|
-
const
|
|
248
|
-
|
|
123
|
+
const manifestFilename = 'manifest.txt';
|
|
124
|
+
const cacheFileName = utils.getCacheFileName(compressionMethod);
|
|
125
|
+
fs_1.writeFileSync(path.join(archiveFolder, manifestFilename), sourceDirectories.join('\n'));
|
|
126
|
+
const workingDirectory = getWorkingDirectory();
|
|
127
|
+
// -T#: Compress using # working thread. If # is 0, attempt to detect and use the number of physical CPU cores.
|
|
128
|
+
// zstdmt is equivalent to 'zstd -T0'
|
|
129
|
+
// --long=#: Enables long distance matching with # bits. Maximum is 30 (1GB) on 32-bit OS and 31 (2GB) on 64-bit.
|
|
130
|
+
// Using 30 here because we also support 32-bit self-hosted runners.
|
|
131
|
+
// Long range mode is added to zstd in v1.3.2 release, so we will not use --long in older version of zstd.
|
|
132
|
+
function getCompressionProgram() {
|
|
133
|
+
switch (compressionMethod) {
|
|
134
|
+
case constants_1.CompressionMethod.Zstd:
|
|
135
|
+
return [
|
|
136
|
+
'--use-compress-program',
|
|
137
|
+
IS_WINDOWS ? 'zstd -T0 --long=30' : 'zstdmt --long=30'
|
|
138
|
+
];
|
|
139
|
+
case constants_1.CompressionMethod.ZstdWithoutLong:
|
|
140
|
+
return ['--use-compress-program', IS_WINDOWS ? 'zstd -T0' : 'zstdmt'];
|
|
141
|
+
default:
|
|
142
|
+
return ['-z'];
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
const args = [
|
|
146
|
+
'--posix',
|
|
147
|
+
...getCompressionProgram(),
|
|
148
|
+
'-cf',
|
|
149
|
+
cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
150
|
+
'--exclude',
|
|
151
|
+
cacheFileName.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
152
|
+
'-P',
|
|
153
|
+
'-C',
|
|
154
|
+
workingDirectory.replace(new RegExp(`\\${path.sep}`, 'g'), '/'),
|
|
155
|
+
'--files-from',
|
|
156
|
+
manifestFilename
|
|
157
|
+
];
|
|
158
|
+
yield execTar(args, compressionMethod, archiveFolder);
|
|
249
159
|
});
|
|
250
160
|
}
|
|
251
161
|
exports.createTar = createTar;
|
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;
|
|
1
|
+
{"version":3,"file":"tar.js","sourceRoot":"","sources":["../../src/internal/tar.ts"],"names":[],"mappings":"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"}
|