@nrwl/nx-cloud 15.2.0-beta.3 → 15.2.0-beta.5
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/core/file-storage/file-storage.d.ts +2 -7
- package/lib/core/file-storage/file-storage.js +4 -16
- package/lib/core/file-storage/file-storage.js.map +1 -1
- package/lib/core/models/run-data.model.d.ts +0 -1
- package/lib/core/models/task-execution.model.d.ts +1 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +1 -0
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +47 -40
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.d.ts +8 -2
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js +19 -3
- package/lib/core/runners/cloud-enabled/cloud-remote-cache.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-run.api.js +3 -0
- package/lib/core/runners/cloud-enabled/cloud-run.api.js.map +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js +1 -1
- package/lib/core/runners/distributed-agent/distributed-agent.impl.js.map +1 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js +9 -1
- package/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.js.map +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js +1 -1
- package/lib/core/runners/distributed-execution/distributed-execution.runner.js.map +1 -1
- package/lib/core/terminal-output/end-of-run-message.js +1 -1
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/lib/daemon/process-run-end.js +9 -2
- package/lib/daemon/process-run-end.js.map +1 -1
- package/lib/nx-cloud-tasks-runner.js +3 -3
- package/lib/nx-cloud-tasks-runner.js.map +1 -1
- package/lib/utilities/axios.js +1 -1
- package/lib/utilities/axios.js.map +1 -1
- package/lib/utilities/environment.d.ts +3 -4
- package/lib/utilities/environment.js +17 -23
- package/lib/utilities/environment.js.map +1 -1
- package/lib/utilities/is-ci.d.ts +1 -1
- package/lib/utilities/is-ci.js +9 -9
- package/lib/utilities/is-ci.js.map +1 -1
- package/lib/utilities/serializer-overrides.js +4 -1
- package/lib/utilities/serializer-overrides.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,13 +3,8 @@ import { ErrorReporterApi } from '../api/error-reporter.api';
|
|
|
3
3
|
export declare class FileStorage {
|
|
4
4
|
private readonly encryption;
|
|
5
5
|
private readonly errorReporter;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
uploads: {
|
|
9
|
-
hash: string;
|
|
10
|
-
url: string;
|
|
11
|
-
}[];
|
|
12
|
-
constructor(encryption: E2EEncryption, errorReporter: ErrorReporterApi, failWhenCannotDownloadArtifact: boolean, recordUploads: boolean);
|
|
6
|
+
storedHashes: string[];
|
|
7
|
+
constructor(encryption: E2EEncryption, errorReporter: ErrorReporterApi);
|
|
13
8
|
retrieve(hash: string, url: string, cacheDirectory: string): Promise<void>;
|
|
14
9
|
store(hash: string, url: string, cacheDirectory: string): Promise<any>;
|
|
15
10
|
private createFileName;
|
|
@@ -21,12 +21,10 @@ const axios = require('axios');
|
|
|
21
21
|
const tar = require('tar');
|
|
22
22
|
const { output } = require('../../utilities/nx-imports');
|
|
23
23
|
class FileStorage {
|
|
24
|
-
constructor(encryption, errorReporter
|
|
24
|
+
constructor(encryption, errorReporter) {
|
|
25
25
|
this.encryption = encryption;
|
|
26
26
|
this.errorReporter = errorReporter;
|
|
27
|
-
this.
|
|
28
|
-
this.recordUploads = recordUploads;
|
|
29
|
-
this.uploads = [];
|
|
27
|
+
this.storedHashes = [];
|
|
30
28
|
}
|
|
31
29
|
retrieve(hash, url, cacheDirectory) {
|
|
32
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -49,23 +47,12 @@ class FileStorage {
|
|
|
49
47
|
const error = e.message || e.toString();
|
|
50
48
|
const errorMessage = `Failed to download or untar the cached artifacts for ${hash}. Error: ${error}`;
|
|
51
49
|
yield this.errorReporter.reportError(errorMessage);
|
|
52
|
-
|
|
53
|
-
throw e;
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
output.warn({
|
|
57
|
-
title: errorMessage,
|
|
58
|
-
bodyLines: [`RETRIEVAL URL: ${url}`],
|
|
59
|
-
});
|
|
60
|
-
}
|
|
50
|
+
throw e;
|
|
61
51
|
}
|
|
62
52
|
});
|
|
63
53
|
}
|
|
64
54
|
store(hash, url, cacheDirectory) {
|
|
65
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
-
if (this.recordUploads) {
|
|
67
|
-
this.uploads.push({ hash, url });
|
|
68
|
-
}
|
|
69
56
|
if (environment_1.VERBOSE_LOGGING) {
|
|
70
57
|
output.note({
|
|
71
58
|
title: `Nx Cloud: Storing ${hash}`,
|
|
@@ -111,6 +98,7 @@ class FileStorage {
|
|
|
111
98
|
tgz = yield this.createFile(hash, cacheDirectory);
|
|
112
99
|
}
|
|
113
100
|
yield this.uploadFile(url, tgz);
|
|
101
|
+
this.storedHashes.push(hash);
|
|
114
102
|
if (environment_1.VERBOSE_LOGGING) {
|
|
115
103
|
output.note({ title: `Nx Cloud: Stored ${hash}` });
|
|
116
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAA6B;AAC7B,6DAMqC;AACrC,iDAA2D;AAE3D,2BAOY;AACZ,mDAA8C;AAC9C,iEAIuC;AAEvC,mCAAoC;AAEpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,MAAa,WAAW;IAGtB,YACmB,UAAyB,EACzB,aAA+B
|
|
1
|
+
{"version":3,"file":"file-storage.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/file-storage/file-storage.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6BAA6B;AAC7B,6DAMqC;AACrC,iDAA2D;AAE3D,2BAOY;AACZ,mDAA8C;AAC9C,iEAIuC;AAEvC,mCAAoC;AAEpC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AAEzD,MAAa,WAAW;IAGtB,YACmB,UAAyB,EACzB,aAA+B;QAD/B,eAAU,GAAV,UAAU,CAAe;QACzB,kBAAa,GAAb,aAAa,CAAkB;QAJlD,iBAAY,GAAG,EAAc,CAAC;IAK3B,CAAC;IAEE,QAAQ,CACZ,IAAY,EACZ,GAAW,EACX,cAAsB;;YAEtB,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,yBAAyB,IAAI,EAAE;oBACtC,SAAS,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC;iBACrC,CAAC,CAAC;aACJ;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACtD,MAAM,cAAc,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACvE,IAAI;gBACF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,cAAc,CAAC,CAAC;gBAClD,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;gBACtC,IAAI,6BAAe,EAAE;oBACnB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,wBAAwB,IAAI,EAAE,EAAE,CAAC,CAAC;iBACxD;aACF;YAAC,OAAO,CAAM,EAAE;gBACf,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACxC,MAAM,YAAY,GAAG,wDAAwD,IAAI,YAAY,KAAK,EAAE,CAAC;gBACrG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBACnD,MAAM,CAAC,CAAC;aACT;QACH,CAAC;KAAA;IAEK,KAAK,CAAC,IAAY,EAAE,GAAW,EAAE,cAAsB;;YAC3D,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC;oBACV,KAAK,EAAE,qBAAqB,IAAI,EAAE;oBAClC,SAAS,EAAE,CAAC,gBAAgB,GAAG,EAAE,CAAC;iBACnC,CAAC,CAAC;aACJ;YAED,IAAI,GAAG,CAAC;YAER,IAAI,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE;gBACvC,MAAM,WAAW,GAAG,CAAC,CAAC;gBACtB,IAAI,WAAW,GAAG,CAAC,CAAC;gBAEpB,IAAI,UAAU,GAAG,KAAK,CAAC;gBACvB,IAAI,UAAU,GAA4C,EAAE,CAAC;gBAE7D,OAAO,WAAW,IAAI,WAAW,IAAI,CAAC,UAAU,EAAE;oBAChD,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;oBAElD,sCAAsC;oBACtC,IAAI,OAAO,GAAG,QAAQ,IAAI,WAAW,WAAW,EAAE,CAAC;oBACnD,IAAA,cAAS,EAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;oBAExC,IAAI;wBACF,MAAM,CAAC,GAAG,IAAA,qBAAgB,EAAC,GAAG,CAAC,CAAC,IAAI,CAClC,GAAG,CAAC,CAAC,CAAC;4BACJ,GAAG,EAAE,OAAO;yBACb,CAAC,CACH,CAAC;wBACF,MAAM,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;wBACvC,UAAU,GAAG,IAAI,CAAC;qBACnB;oBAAC,OAAO,CAAC,EAAE;wBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACjB,MAAM,IAAA,aAAI,EAAC,IAAI,CAAC,CAAC;qBAClB;oBACD,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;oBAC/D,WAAW,EAAE,CAAC;iBACf;gBAED,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE;oBACtC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;oBACnD,MAAM,oBAAoB,GAAG,UAAU;yBACpC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;yBACzB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;yBACrB,IAAI,CAAC,IAAI,CAAC,CAAC;oBACd,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,gBAAgB,oBAAoB,WAAW,UAAU,CAAC,MAAM,EAAE,CAChG,CAAC;iBACH;aACF;iBAAM;gBACL,sBAAsB;gBACtB,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;aACnD;YAED,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAChC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,6BAAe,EAAE;gBACnB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,oBAAoB,IAAI,EAAE,EAAE,CAAC,CAAC;aACpD;QACH,CAAC;KAAA;IAEO,cAAc,CAAC,IAAY,EAAE,cAAsB;QACzD,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,IAAI,SAAS,CAAC,CAAC;IACrD,CAAC;IAEa,YAAY,CAAC,GAAW,EAAE,GAAW,EAAE,cAAsB;;;YACzE,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,cAAc,CAAC,CAAC;YAEtD,IAAI,IAAI,CAAC;YAET,IAAI;gBACF,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACnC,KAAK,CAAC,GAAG,EAAE;oBACT,MAAM,EAAE,KAAK;oBACb,YAAY,EAAE,QAAQ;oBACtB,gBAAgB,EAAE,kCAAoB;wBACpC,CAAC,CAAC,iCAAmB;wBACrB,CAAC,CAAC,qCAAuB;oBAC3B,aAAa,EAAE,kCAAoB;wBACjC,CAAC,CAAC,iCAAmB;wBACrB,CAAC,CAAC,qCAAuB;oBAC3B,OAAO,EAAE,kCAAoB,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,KAAK;iBAC1D,CAAC,CACH,CAAC;gBAEF,QAAQ,CAAC,YAAY,iCAChB,IAAA,kCAAkB,EAAC,IAAI,CAAC,KAC3B,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAChD,CAAC;aACJ;YAAC,OAAO,CAAM,EAAE;gBACf,6CAA6C;gBAC7C,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBACF,MAAM,CAAC,CAAC;aACT;YAED,gFAAgF;YAChF,iFAAiF;YACjF,uBAAuB;YACvB,IAAI,IAAA,eAAU,EAAC,GAAG,CAAC,EAAE;gBACnB,IAAI,CAAC,GAAG,CAAC,CAAC;gBACV,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE;oBACf,IAAI,IAAA,eAAU,EAAC,cAAc,CAAC;wBAAE,OAAO;oBACvC,MAAM,IAAA,aAAI,EAAC,GAAG,CAAC,CAAC;iBACjB;aACF;YAED,kFAAkF;YAClF,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE;gBACnC,MAAM,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACxB,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,sBAAiB,EAAC,GAAG,CAAC,CAAC,CAAC;oBACjD,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACjC,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBAEjC,MAAM,CAAC,GAAG,IAAA,qBAAgB,EAAC,GAAG,CAAC,CAAC,IAAI,CAClC,GAAG,CAAC,CAAC,CAAC;oBACJ,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;iBACvB,CAAC,CACH,CAAC;gBACF,OAAO,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;aACzC;iBAAM;gBACL,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CACtB,GAAG,CAAC,CAAC,CAAC;oBACJ,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;iBACvB,CAAC,CACH,CAAC;gBACF,OAAO,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC;aACzC;;KACF;IAEO,wBAAwB,CAAC,CAAM;QACrC,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;YAC9B,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;gBAClB,IACE,CAAC,CAAC,OAAO,KAAK,WAAW;oBACzB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,CAAC,CAAC,EAChD;oBACA,OAAO,CAAC,IAAI,CACV,0DAA0D,CAC3D,CAAC;oBACF,GAAG,CAAC,IAAI,CAAC,CAAC;iBACX;qBAAM;oBACL,GAAG,CAAC,CAAC,CAAC,CAAC;iBACR;YACH,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,gBAAgB,CAAC,cAAsB;QAC7C,IAAA,kBAAa,EAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC;IAEO,oBAAoB,CAAC,IAAY,EAAE,cAAsB;QAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,IAAI,SAAS,CAAC,CAAC;IACrD,CAAC;IAEa,UAAU,CAAC,IAAY,EAAE,cAAsB;;YAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACtD,MAAM,GAAG,CAAC,CAAC,CACT;gBACE,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,GAAG;gBACT,GAAG,EAAE,cAAc;aACpB,EACD,CAAC,IAAI,CAAC,CACP,CAAC;YACF,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,EAAE;gBACnC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;aAClC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAEa,UAAU,CAAC,GAAW,EAAE,GAAW;;;YAC/C,MAAM,QAAQ,GAAG,IAAA,oCAAoB,EAAC,WAAW,CAAC,CAAC;YACnD,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,GAAG,CAAC,CAAC;YAClC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAExD,IAAI;gBACF,MAAM,IAAI,GAAG,MAAM,IAAA,0BAAkB,EAAC,GAAG,EAAE,CACzC,KAAK,CAAC,GAAG,EAAE;oBACT,MAAM,EAAE,KAAK;oBACb,IAAI,EAAE,OAAO;oBACb,OAAO,EAAE,OAAO;oBAChB,gBAAgB,EAAE,kCAAoB;wBACpC,CAAC,CAAC,iCAAmB;wBACrB,CAAC,CAAC,qCAAuB;oBAC3B,aAAa,EAAE,kCAAoB;wBACjC,CAAC,CAAC,iCAAmB;wBACrB,CAAC,CAAC,qCAAuB;oBAC3B,OAAO,EAAE,kCAAoB,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,MAAM;iBAC3D,CAAC,CACH,CAAC;gBACF,QAAQ,CAAC,YAAY,iCAChB,IAAA,kCAAkB,EAAC,IAAI,CAAC,KAC3B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAClD,CAAC;aACJ;YAAC,OAAO,CAAM,EAAE;gBACf,QAAQ,CAAC,YAAY,CACnB,CAAA,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,cAAc,0CAAE,QAAQ;oBACzB,CAAC,CAAC,IAAA,kCAAkB,EAAC,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAC/C,CAAC,CAAC,yCAAyB,CAC9B,CAAC;gBACF,MAAM,CAAC,CAAC;aACT;;KACF;IAEO,WAAW,CAAC,IAAY;QAC9B,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,CAAC;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACpB,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAEO,oBAAoB,CAAC,GAAW,EAAE,OAAe;QACvD,MAAM,sBAAsB,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG;YACd,cAAc,EAAE,0BAA0B;YAC1C,gBAAgB,EAAE,WAAW;SAC9B,CAAC;QAEF,IAAI,sBAAsB,EAAE;YAC1B,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC;SAClC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;CACF;AA3QD,kCA2QC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":";;;AAGA,kFAA6E;AAC7E,+FAAyF;AAEzF,MAAa,qBAAqB;IAChC,YACmB,UAAsB,EACtB,cAAkC,EAClC,qBAA8B,EAC9B,mBAA6B,EAC7B,gBAAkC,EAClC,KAAsB;QALtB,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAoB;QAClC,0BAAqB,GAArB,qBAAqB,CAAS;QAC9B,wBAAmB,GAAnB,mBAAmB,CAAU;QAC7B,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,UAAK,GAAL,KAAK,CAAiB;IACtC,CAAC;IAEJ,YAAY,CAAC,IAAU;QACrB,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,gDAAgD;IAChD,SAAS,CAAC,IAAU;QAClB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACnC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;YAC1B,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO;YAChC,IAAI,EAAE,IAAI,CAAC,IAAK;YAChB,WAAW,EAAE,IAAI,CAAC,kBAAkB,CAAE,IAAY,CAAC,WAAW,CAAC;YAC/D,MAAM,EAAE,IAAA,yCAAkB,EAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,9 +21,9 @@ const cloud_remote_cache_1 = require("./cloud-remote-cache");
|
|
|
21
21
|
const cloud_run_api_1 = require("./cloud-run.api");
|
|
22
22
|
const fs_1 = require("fs");
|
|
23
23
|
const path = require("path");
|
|
24
|
+
const path_1 = require("path");
|
|
24
25
|
const metric_logger_1 = require("../../../utilities/metric-logger");
|
|
25
26
|
const error_reporter_api_1 = require("../../api/error-reporter.api");
|
|
26
|
-
const path_1 = require("path");
|
|
27
27
|
const fs_extra_1 = require("fs-extra");
|
|
28
28
|
const id_generator_1 = require("./id-generator");
|
|
29
29
|
const { tasksRunner, output } = require('../../../utilities/nx-imports');
|
|
@@ -58,7 +58,7 @@ function storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory) {
|
|
|
58
58
|
.map((t) => t.hash);
|
|
59
59
|
hashes.forEach((hash) => remoteCache.store(hash, nxCacheDirectory));
|
|
60
60
|
}
|
|
61
|
-
function onComplete({ daemon,
|
|
61
|
+
function onComplete({ daemon, options, fileStorage, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions, versionOfNxBefore133, inner, encryptionKey, storeInCurrentProcess, distributedExecutionId, runContext, }) {
|
|
62
62
|
return __awaiter(this, void 0, void 0, function* () {
|
|
63
63
|
const runEndTime = new Date().toISOString();
|
|
64
64
|
const branch = (0, environment_1.getBranch)();
|
|
@@ -66,7 +66,7 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
66
66
|
command: outputObfuscator.obfuscate((0, environment_1.parseCommand)()),
|
|
67
67
|
startTime: runStartTime,
|
|
68
68
|
endTime: runEndTime,
|
|
69
|
-
distributedExecutionId
|
|
69
|
+
distributedExecutionId,
|
|
70
70
|
branch: branch,
|
|
71
71
|
scan: true,
|
|
72
72
|
runGroup: (0, environment_1.getRunGroup)(),
|
|
@@ -75,10 +75,10 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
75
75
|
sha: branch ? (0, environment_1.extractGitSha)() : undefined,
|
|
76
76
|
inner: inner,
|
|
77
77
|
};
|
|
78
|
-
if (
|
|
79
|
-
if (environment_1.
|
|
78
|
+
if (storeInCurrentProcess) {
|
|
79
|
+
if ((0, environment_1.agentRunningInDistributedExecution)()) {
|
|
80
80
|
const nxCacheDirectory = (0, environment_1.getNxCacheDirectory)(options);
|
|
81
|
-
storeTaskHashes(taskExecutions, nxCacheDirectory,
|
|
81
|
+
storeTaskHashes(taskExecutions, nxCacheDirectory, distributedExecutionId);
|
|
82
82
|
storeLocalCacheHits(taskExecutions, remoteCache, nxCacheDirectory);
|
|
83
83
|
}
|
|
84
84
|
try {
|
|
@@ -89,7 +89,14 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
89
89
|
title: `Nx Cloud wasn't able to store artifacts.`,
|
|
90
90
|
});
|
|
91
91
|
messages.printMessages();
|
|
92
|
-
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
for (const hash of fileStorage.storedHashes) {
|
|
95
|
+
const matchingTask = taskExecutions.find((t) => t.hash === hash);
|
|
96
|
+
if (!matchingTask) {
|
|
97
|
+
throw new Error(`Task with hash ${hash} isn't recorded`);
|
|
98
|
+
}
|
|
99
|
+
matchingTask.uploadedToStorage = true;
|
|
93
100
|
}
|
|
94
101
|
try {
|
|
95
102
|
yield api.endRun(runData, taskExecutions);
|
|
@@ -99,9 +106,10 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
99
106
|
title: `Nx Cloud wasn't able to record its run.`,
|
|
100
107
|
});
|
|
101
108
|
messages.printMessages();
|
|
102
|
-
|
|
109
|
+
return false;
|
|
103
110
|
}
|
|
104
111
|
yield (0, metric_logger_1.submitRunMetrics)(options);
|
|
112
|
+
return true;
|
|
105
113
|
}
|
|
106
114
|
else {
|
|
107
115
|
try {
|
|
@@ -110,7 +118,7 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
110
118
|
yield daemon.processInBackground('@nrwl/nx-cloud/lib/daemon/process-run-end', {
|
|
111
119
|
encryptionKey,
|
|
112
120
|
runnerOptions: Object.assign(Object.assign({}, options), { accessToken }),
|
|
113
|
-
|
|
121
|
+
delayedStoreRequests: remoteCache.delayedStoreRequests,
|
|
114
122
|
runEnd: {
|
|
115
123
|
runData,
|
|
116
124
|
taskExecutions,
|
|
@@ -118,12 +126,14 @@ function onComplete({ daemon, lifeCycle, options, remoteCache, api, outputObfusc
|
|
|
118
126
|
},
|
|
119
127
|
});
|
|
120
128
|
runContext.runUrl = `${options.url || 'https://nx.app'}/runs/${linkId}`;
|
|
129
|
+
return true;
|
|
121
130
|
}
|
|
122
131
|
catch (e) {
|
|
123
132
|
output.warn({
|
|
124
133
|
title: `Nx Cloud Problems`,
|
|
125
134
|
bodyLines: [e.message || e.toString()],
|
|
126
135
|
});
|
|
136
|
+
return false;
|
|
127
137
|
}
|
|
128
138
|
}
|
|
129
139
|
// this workaround is required because prior to Nx 13.3 we printed
|
|
@@ -157,7 +167,7 @@ function createLifeCycle(runContext, options, outputObfuscator, tasks) {
|
|
|
157
167
|
return cloudEnabledLifeCycle;
|
|
158
168
|
}
|
|
159
169
|
}
|
|
160
|
-
function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options) {
|
|
170
|
+
function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId) {
|
|
161
171
|
return __awaiter(this, void 0, void 0, function* () {
|
|
162
172
|
let hashes = tasks.map((t) => t.hash).filter((h) => !!h);
|
|
163
173
|
const cachePath = (0, environment_1.getNxCacheDirectory)(options);
|
|
@@ -176,26 +186,16 @@ function fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options) {
|
|
|
176
186
|
hashes = missingHashes;
|
|
177
187
|
}
|
|
178
188
|
if (hashes.length > 0) {
|
|
179
|
-
const startRunRequest = api.startRun(
|
|
189
|
+
const startRunRequest = api.startRun(distributedExecutionId, hashes);
|
|
180
190
|
for (const hash of hashes) {
|
|
181
191
|
runContext.requests[hash] = startRunRequest;
|
|
182
192
|
}
|
|
183
193
|
}
|
|
184
194
|
});
|
|
185
195
|
}
|
|
186
|
-
function isConnectedToPrivateCloud(options) {
|
|
187
|
-
if (!options.url)
|
|
188
|
-
return false;
|
|
189
|
-
if (options.url.endsWith('api.nrwl.io'))
|
|
190
|
-
return false;
|
|
191
|
-
if (options.url.endsWith('.nx.app'))
|
|
192
|
-
return false;
|
|
193
|
-
if (options.url.indexOf('localhost') > -1)
|
|
194
|
-
return false;
|
|
195
|
-
return true;
|
|
196
|
-
}
|
|
197
196
|
function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
198
197
|
var _a;
|
|
198
|
+
const distributedExecutionId = process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
199
199
|
const runContext = {
|
|
200
200
|
statuses: {},
|
|
201
201
|
scheduledTasks: [],
|
|
@@ -213,13 +213,11 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
213
213
|
const encryptionKey = environment_1.ENCRYPTION_KEY || options.encryptionKey;
|
|
214
214
|
const encryption = new e2e_encryption_1.E2EEncryption(encryptionKey);
|
|
215
215
|
const errorApi = new error_reporter_api_1.ErrorReporterApi(options);
|
|
216
|
-
const
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi, false, uploadInCurrentProcess);
|
|
220
|
-
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage);
|
|
216
|
+
const storeInCurrentProcess = (0, environment_1.agentRunningInDistributedExecution)() || !((_a = context.daemon) === null || _a === void 0 ? void 0 : _a.enabled());
|
|
217
|
+
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi);
|
|
218
|
+
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage, distributedExecutionId, storeInCurrentProcess);
|
|
221
219
|
// we don't await for it cause this step is optional
|
|
222
|
-
fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options);
|
|
220
|
+
fetchUrlsForKnownHashesUpfront(api, runContext, tasks, options, distributedExecutionId);
|
|
223
221
|
// have to reset it so we don't capture inner tasks
|
|
224
222
|
delete process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
225
223
|
const res = tasksRunner(tasks, Object.assign(Object.assign({}, options), { remoteCache, lifeCycle }), context);
|
|
@@ -231,10 +229,10 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
231
229
|
next: (value) => wrappedRes.next(value),
|
|
232
230
|
error: (err) => wrappedRes.error(err),
|
|
233
231
|
complete: () => __awaiter(this, void 0, void 0, function* () {
|
|
234
|
-
yield onComplete({
|
|
232
|
+
const success = yield onComplete({
|
|
235
233
|
daemon: context.daemon,
|
|
236
|
-
lifeCycle,
|
|
237
234
|
options,
|
|
235
|
+
fileStorage,
|
|
238
236
|
remoteCache,
|
|
239
237
|
api,
|
|
240
238
|
outputObfuscator,
|
|
@@ -245,10 +243,13 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
245
243
|
versionOfNxBefore133,
|
|
246
244
|
inner,
|
|
247
245
|
encryptionKey,
|
|
248
|
-
|
|
249
|
-
uploadInCurrentProcess,
|
|
246
|
+
storeInCurrentProcess,
|
|
250
247
|
runContext,
|
|
248
|
+
distributedExecutionId,
|
|
251
249
|
});
|
|
250
|
+
if (!success && (0, environment_1.agentRunningInDistributedExecution)()) {
|
|
251
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
252
|
+
}
|
|
252
253
|
wrappedRes.complete();
|
|
253
254
|
}),
|
|
254
255
|
});
|
|
@@ -258,10 +259,10 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
258
259
|
else {
|
|
259
260
|
return res
|
|
260
261
|
.then((r) => __awaiter(this, void 0, void 0, function* () {
|
|
261
|
-
yield onComplete({
|
|
262
|
+
const success = yield onComplete({
|
|
262
263
|
daemon: context.daemon,
|
|
263
|
-
lifeCycle,
|
|
264
264
|
options,
|
|
265
|
+
fileStorage,
|
|
265
266
|
remoteCache,
|
|
266
267
|
api,
|
|
267
268
|
outputObfuscator,
|
|
@@ -272,17 +273,20 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
272
273
|
versionOfNxBefore133,
|
|
273
274
|
inner,
|
|
274
275
|
encryptionKey,
|
|
275
|
-
|
|
276
|
-
uploadInCurrentProcess,
|
|
276
|
+
storeInCurrentProcess,
|
|
277
277
|
runContext,
|
|
278
|
+
distributedExecutionId,
|
|
278
279
|
});
|
|
280
|
+
if (!success && (0, environment_1.agentRunningInDistributedExecution)()) {
|
|
281
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
282
|
+
}
|
|
279
283
|
return r;
|
|
280
284
|
}))
|
|
281
285
|
.catch((e) => __awaiter(this, void 0, void 0, function* () {
|
|
282
|
-
yield onComplete({
|
|
286
|
+
const success = yield onComplete({
|
|
283
287
|
daemon: context.daemon,
|
|
284
|
-
lifeCycle,
|
|
285
288
|
options,
|
|
289
|
+
fileStorage,
|
|
286
290
|
remoteCache,
|
|
287
291
|
api,
|
|
288
292
|
outputObfuscator,
|
|
@@ -293,10 +297,13 @@ function cloudEnabledTasksRunner(tasks, options, context, inner = false) {
|
|
|
293
297
|
versionOfNxBefore133,
|
|
294
298
|
inner,
|
|
295
299
|
encryptionKey,
|
|
296
|
-
|
|
297
|
-
uploadInCurrentProcess,
|
|
300
|
+
storeInCurrentProcess,
|
|
298
301
|
runContext,
|
|
302
|
+
distributedExecutionId,
|
|
299
303
|
});
|
|
304
|
+
if (!success && (0, environment_1.agentRunningInDistributedExecution)()) {
|
|
305
|
+
process.exit(environment_1.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE);
|
|
306
|
+
}
|
|
300
307
|
throw e;
|
|
301
308
|
}));
|
|
302
309
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6EAAyE;AACzE,iFAA2E;AAC3E,+EAA2E;AAC3E,yEAAmE;AACnE,kEAA8D;AAC9D,sEAAkE;AAClE,
|
|
1
|
+
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,16 @@ export declare class CloudRemoteCache {
|
|
|
7
7
|
private readonly api;
|
|
8
8
|
private readonly runContext;
|
|
9
9
|
private readonly fileStorage;
|
|
10
|
+
private readonly distributedExecutionId;
|
|
11
|
+
private readonly storeInCurrentProcess;
|
|
10
12
|
private readonly storeRequests;
|
|
11
|
-
|
|
13
|
+
delayedStoreRequests: {
|
|
14
|
+
hash: string;
|
|
15
|
+
url: string;
|
|
16
|
+
}[];
|
|
17
|
+
constructor(messages: MessageReporter, api: CloudRunApi, runContext: RunContext, fileStorage: FileStorage, distributedExecutionId: string | undefined, storeInCurrentProcess: boolean);
|
|
12
18
|
retrieve(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
13
19
|
store(hash: string, cacheDirectory: string): Promise<boolean>;
|
|
14
20
|
private hashUrls;
|
|
15
|
-
waitForStoreRequestsToComplete(): Promise<
|
|
21
|
+
waitForStoreRequestsToComplete(): Promise<void>;
|
|
16
22
|
}
|
|
@@ -13,12 +13,15 @@ exports.CloudRemoteCache = void 0;
|
|
|
13
13
|
const environment_1 = require("../../../utilities/environment");
|
|
14
14
|
const { output } = require('../../../utilities/nx-imports');
|
|
15
15
|
class CloudRemoteCache {
|
|
16
|
-
constructor(messages, api, runContext, fileStorage) {
|
|
16
|
+
constructor(messages, api, runContext, fileStorage, distributedExecutionId, storeInCurrentProcess) {
|
|
17
17
|
this.messages = messages;
|
|
18
18
|
this.api = api;
|
|
19
19
|
this.runContext = runContext;
|
|
20
20
|
this.fileStorage = fileStorage;
|
|
21
|
+
this.distributedExecutionId = distributedExecutionId;
|
|
22
|
+
this.storeInCurrentProcess = storeInCurrentProcess;
|
|
21
23
|
this.storeRequests = [];
|
|
24
|
+
this.delayedStoreRequests = [];
|
|
22
25
|
}
|
|
23
26
|
retrieve(hash, cacheDirectory) {
|
|
24
27
|
var _a;
|
|
@@ -40,6 +43,10 @@ class CloudRemoteCache {
|
|
|
40
43
|
}
|
|
41
44
|
catch (ee) {
|
|
42
45
|
const e = (_a = ee.axiosException) !== null && _a !== void 0 ? _a : ee;
|
|
46
|
+
// TODO: vsavkin remove this handling Oct 2023
|
|
47
|
+
// 404 indicates that something is broken, but older versions
|
|
48
|
+
// of the api can result in such errors
|
|
49
|
+
// we ignore them for now
|
|
43
50
|
if (e.response && e.response.status === 404) {
|
|
44
51
|
if (environment_1.VERBOSE_LOGGING) {
|
|
45
52
|
output.note({ title: `Nx Cloud: Cache miss ${hash}. Status 404.` });
|
|
@@ -75,6 +82,10 @@ class CloudRemoteCache {
|
|
|
75
82
|
}
|
|
76
83
|
return true;
|
|
77
84
|
}
|
|
85
|
+
if (!this.storeInCurrentProcess) {
|
|
86
|
+
this.delayedStoreRequests.push({ hash: hash, url: hashUrls.put });
|
|
87
|
+
return true;
|
|
88
|
+
}
|
|
78
89
|
try {
|
|
79
90
|
yield this.fileStorage.store(hash, hashUrls.put, cacheDirectory);
|
|
80
91
|
return true;
|
|
@@ -101,7 +112,7 @@ class CloudRemoteCache {
|
|
|
101
112
|
if (scheduledTaskHashesWithoutRequests.indexOf(hash) === -1) {
|
|
102
113
|
scheduledTaskHashesWithoutRequests.push(hash);
|
|
103
114
|
}
|
|
104
|
-
const request = this.api.startRun(
|
|
115
|
+
const request = this.api.startRun(this.distributedExecutionId, scheduledTaskHashesWithoutRequests);
|
|
105
116
|
scheduledTaskHashesWithoutRequests.forEach((taskHash) => {
|
|
106
117
|
this.runContext.requests[taskHash] = request;
|
|
107
118
|
});
|
|
@@ -110,7 +121,12 @@ class CloudRemoteCache {
|
|
|
110
121
|
});
|
|
111
122
|
}
|
|
112
123
|
waitForStoreRequestsToComplete() {
|
|
113
|
-
return
|
|
124
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
+
const res = yield Promise.all(this.storeRequests).then((r) => r.reduce((a, b) => a && b, true));
|
|
126
|
+
if (!res) {
|
|
127
|
+
throw new Error(`Error when storing artifacts`);
|
|
128
|
+
}
|
|
129
|
+
});
|
|
114
130
|
}
|
|
115
131
|
}
|
|
116
132
|
exports.CloudRemoteCache = CloudRemoteCache;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,
|
|
1
|
+
{"version":3,"file":"cloud-remote-cache.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-remote-cache.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,9 @@ class CloudRunApi {
|
|
|
27
27
|
startRun(distributedExecutionId, hashes) {
|
|
28
28
|
var _a;
|
|
29
29
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
// API is not working, don't make the end request
|
|
31
|
+
if (this.messages.apiError)
|
|
32
|
+
return {};
|
|
30
33
|
const recorder = (0, metric_logger_1.createMetricRecorder)('startRun');
|
|
31
34
|
try {
|
|
32
35
|
const request = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-run.api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-run.api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"cloud-run.api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/cloud-enabled/cloud-run.api.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,7 +70,7 @@ function startAgent() {
|
|
|
70
70
|
createAgentLockfileAndSetUpListeners(api, options, agentName);
|
|
71
71
|
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
72
72
|
const errorReporter = new error_reporter_api_1.ErrorReporterApi(options);
|
|
73
|
-
const dteArtifactStorage = new dte_artifact_storage_1.DteArtifactStorage(new file_storage_1.FileStorage(encryption, errorReporter
|
|
73
|
+
const dteArtifactStorage = new dte_artifact_storage_1.DteArtifactStorage(new file_storage_1.FileStorage(encryption, errorReporter), (0, environment_1.getNxCacheDirectory)(options));
|
|
74
74
|
const invokeTasks = initTasksRunner
|
|
75
75
|
? yield (0, invoke_tasks_using_nx_imperative_api_1.invokeTasksUsingNxImperativeApi)(options)
|
|
76
76
|
: yield (0, invoke_tasks_using_run_many_1.invokeTasksUsingRunMany)(options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributed-agent.impl.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/distributed-agent.impl.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"distributed-agent.impl.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/distributed-agent.impl.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,10 @@ function invokeTasksUsingNxImperativeApi(options) {
|
|
|
24
24
|
'dot-notation': true,
|
|
25
25
|
},
|
|
26
26
|
});
|
|
27
|
+
const unparsed = (0, serializer_overrides_1.unparse)(params);
|
|
28
|
+
if (params._.length == 0) {
|
|
29
|
+
delete params._;
|
|
30
|
+
}
|
|
27
31
|
return {
|
|
28
32
|
id: t.taskId,
|
|
29
33
|
target: {
|
|
@@ -31,9 +35,13 @@ function invokeTasksUsingNxImperativeApi(options) {
|
|
|
31
35
|
target: t.target,
|
|
32
36
|
configuration: t.configuration,
|
|
33
37
|
},
|
|
34
|
-
overrides: Object.assign(Object.assign({}, params), { __overrides_unparsed__:
|
|
38
|
+
overrides: Object.assign(Object.assign({}, params), { __overrides_unparsed__: unparsed }),
|
|
35
39
|
};
|
|
36
40
|
});
|
|
41
|
+
process.env.NX_CACHE_FAILURES = 'true'; // this is only requires because of how we do uploads
|
|
42
|
+
process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID = executionId;
|
|
43
|
+
process.env.NX_STREAM_OUTPUT = 'true';
|
|
44
|
+
process.env.NX_PREFIX_OUTPUT = 'true';
|
|
37
45
|
const r = yield tasksRunner.invoke({ tasks, parallel });
|
|
38
46
|
const completedTasks = Object.values(r.taskGraph.tasks);
|
|
39
47
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invoke-tasks-using-nx-imperative-api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACrE,uCAAuC;AACvC,kFAAkE;AAElE,SAAsB,+BAA+B,CACnD,OAA+B;;QAE/B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CACL,WAAmB,EACnB,cAA+B,EAC/B,QAAgB,EAIf,EAAE;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC9B,aAAa,EAAE;wBACb,sBAAsB,EAAE,KAAK;wBAC7B,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAC,CAAC;gBAEH,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,MAAM;oBACZ,MAAM,EAAE;wBACN,OAAO,EAAE,CAAC,CAAC,WAAW;wBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;qBAC/B;oBACD,SAAS,kCACJ,MAAM,KACT,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"invoke-tasks-using-nx-imperative-api.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-agent/invoke-tasks-using-nx-imperative-api.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AACrE,uCAAuC;AACvC,kFAAkE;AAElE,SAAsB,+BAA+B,CACnD,OAA+B;;QAE/B,MAAM,WAAW,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,CACL,WAAmB,EACnB,cAA+B,EAC/B,QAAgB,EAIf,EAAE;YACH,MAAM,KAAK,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE;oBAC9B,aAAa,EAAE;wBACb,sBAAsB,EAAE,KAAK;wBAC7B,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG,IAAA,8BAAO,EAAC,MAAM,CAAC,CAAC;gBACjC,IAAI,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;oBACxB,OAAQ,MAAc,CAAC,CAAC,CAAC;iBAC1B;gBAED,OAAO;oBACL,EAAE,EAAE,CAAC,CAAC,MAAM;oBACZ,MAAM,EAAE;wBACN,OAAO,EAAE,CAAC,CAAC,WAAW;wBACtB,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,aAAa,EAAE,CAAC,CAAC,aAAa;qBAC/B;oBACD,SAAS,kCACJ,MAAM,KACT,sBAAsB,EAAE,QAAQ,GACjC;iBACF,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,CAAC,qDAAqD;YAC7F,OAAO,CAAC,GAAG,CAAC,iCAAiC,GAAG,WAAW,CAAC;YAC5D,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YACtC,OAAO,CAAC,GAAG,CAAC,gBAAgB,GAAG,MAAM,CAAC;YAEtC,MAAM,CAAC,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;YACxD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC;oBAC9C,MAAM,EAAE,CAAC,CAAC,EAAE;oBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;iBACb,CAAC,CAAC;gBACH,mBAAmB,EAAE,CAAC,CAAC,MAAM;aAC9B,CAAC;QACJ,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AAtDD,0EAsDC"}
|
|
@@ -47,7 +47,7 @@ const nxCloudDistributedTasksRunner = (tasks, options, context) => __awaiter(voi
|
|
|
47
47
|
}
|
|
48
48
|
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
49
49
|
const errorReporter = new error_reporter_api_1.ErrorReporterApi(options);
|
|
50
|
-
const dteArtifactStorage = new dte_artifact_storage_1.DteArtifactStorage(new file_storage_1.FileStorage(encryption, errorReporter
|
|
50
|
+
const dteArtifactStorage = new dte_artifact_storage_1.DteArtifactStorage(new file_storage_1.FileStorage(encryption, errorReporter), (0, environment_1.getNxCacheDirectory)(options));
|
|
51
51
|
const api = new distributed_execution_api_1.DistributedExecutionApi(options);
|
|
52
52
|
attachSignalListenersToCompleteRunGroupOnError(api, runGroup);
|
|
53
53
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"distributed-execution.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/distributed-execution.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAKwC;AACxC,oEAAoE;AACpE,qEAAgE;AAChE,6EAAuE;AACvE,sEAAkE;AAClE,kEAA8D;AAG9D,2EAGqC;AACrC,iFAAsE;AACtE,6DAA6D;AAC7D,mDAA+C;AAC/C,kFAA6E;AAE7E,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAC;AAE5D,MAAM,aAAa;IACjB,YAAY,CAAC,IAAU,IAAS,CAAC;IAEjC,SAAS,CAAC,IAAU,IAAS,CAAC;IAE9B,QAAQ,CAAC,KAAmB,IAAS,CAAC;CACvC;AAEM,MAAM,6BAA6B,GAAQ,CAChD,KAAa,EACb,OAA+B,EAC/B,OAAY,EACZ,EAAE;IACF,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,0EAA0E;YACjF,QAAQ,EAAE,CAAC,oDAAoD,CAAC;SACjE,CAAC,CAAC;KACJ;IACD,IAAI,6BAAe,EAAE;QACnB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EAAE,wCAAwC;SAChD,CAAC,CAAC;KACJ;IACD,OAAO,CAAC,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;IACxC,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,IAAI,CAAC,QAAQ,EAAE;QACb,IAAA,0CAAkB,GAAE,CAAC;QACrB,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACxB;IAED,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,4BAAc,IAAI,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9E,MAAM,aAAa,GAAG,IAAI,qCAAgB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,kBAAkB,GAAG,IAAI,yCAAkB,CAC/C,IAAI,0BAAW,CAAC,UAAU,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"distributed-execution.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/lib/core/runners/distributed-execution/distributed-execution.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ class EndOfRunMessage {
|
|
|
9
9
|
this.taskExecutions = taskExecutions;
|
|
10
10
|
}
|
|
11
11
|
printCacheHitsMessage() {
|
|
12
|
-
if (environment_1.
|
|
12
|
+
if ((0, environment_1.agentRunningInDistributedExecution)())
|
|
13
13
|
return;
|
|
14
14
|
if (!this.runContext.runUrl) {
|
|
15
15
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,
|
|
1
|
+
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAEA,6DAAiF;AACjF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,UAAsB,EACtB,cAA+B;QAD/B,eAAU,GAAV,UAAU,CAAY;QACtB,mBAAc,GAAd,cAAc,CAAiB;IAC/C,CAAC;IAEJ,qBAAqB;QACnB,IAAI,IAAA,gDAAkC,GAAE;YAAE,OAAO;QAEjD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;YAC3B,OAAO;SACR;QAED,MAAM,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAC/C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,KAAK,YAAY,CACxC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,kBAAkB,CAAC;aACtE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;QAE7B,MAAM,OAAO,GAAG,EAAW,CAAC;QAC5B,IAAI,SAAS,EAAE;YACb,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACtE,CAAC;SACH;aAAM,IAAI,cAAc,EAAE;YACzB,OAAO,CAAC,IAAI,CACV,6CAA6C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACtE,CAAC;SACH;aAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YAC1B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,QAAQ,CAAC;YACnE,OAAO,CAAC,IAAI,CACV,sCAAsC,KAAK,KAAK,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CACzE,CAAC;SACH;aAAM;YACL,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBAC1B,OAAO,CAAC,IAAI,CAAC,gCAAgC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;aACxE;SACF;QACD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,IAAA,4BAAY,EAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;SACjC;IACH,CAAC;CACF;AA7CD,0CA6CC"}
|
|
@@ -20,7 +20,7 @@ function processRunEnd(data, logger) {
|
|
|
20
20
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
21
|
const encryption = new e2e_encryption_1.E2EEncryption(data.encryptionKey);
|
|
22
22
|
const errorApi = new error_reporter_api_1.ErrorReporterApi(data.runnerOptions);
|
|
23
|
-
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi
|
|
23
|
+
const fileStorage = new file_storage_1.FileStorage(encryption, errorApi);
|
|
24
24
|
const cachePath = (0, environment_1.getNxCacheDirectory)(data.runnerOptions);
|
|
25
25
|
const reporter = new message_reporter_1.MessageReporter(data.runnerOptions);
|
|
26
26
|
const runContext = {};
|
|
@@ -29,7 +29,7 @@ function processRunEnd(data, logger) {
|
|
|
29
29
|
setTimeout(() => __awaiter(this, void 0, void 0, function* () {
|
|
30
30
|
logger.log('Uploading file artifacts');
|
|
31
31
|
try {
|
|
32
|
-
yield Promise.all(data.
|
|
32
|
+
yield Promise.all(data.delayedStoreRequests.map((t) => fileStorage.store(t.hash, t.url, cachePath)));
|
|
33
33
|
logger.log('Done uploading file artifacts');
|
|
34
34
|
}
|
|
35
35
|
catch (e) {
|
|
@@ -37,6 +37,13 @@ function processRunEnd(data, logger) {
|
|
|
37
37
|
console.log(e);
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
|
+
for (const hash of fileStorage.storedHashes) {
|
|
41
|
+
const matchingTask = data.runEnd.taskExecutions.find((t) => t.hash === hash);
|
|
42
|
+
if (!matchingTask) {
|
|
43
|
+
throw new Error(`Task with hash ${hash} isn't recorded`);
|
|
44
|
+
}
|
|
45
|
+
matchingTask.uploadedToStorage = true;
|
|
46
|
+
}
|
|
40
47
|
logger.log('Sending EndRun request');
|
|
41
48
|
// check the return value
|
|
42
49
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-run-end.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/daemon/process-run-end.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oEAAgE;AAChE,+EAA0E;AAC1E,uEAAkE;AAClE,wEAAoE;AACpE,0DAA+E;AAC/E,+EAA2E;AAC3E,8DAA8D;AAE9D,SAA8B,aAAa,CACzC,IAAS,EACT,MAAsC;;QAEtC,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,qCAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,UAAU,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"process-run-end.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/daemon/process-run-end.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,oEAAgE;AAChE,+EAA0E;AAC1E,uEAAkE;AAClE,wEAAoE;AACpE,0DAA+E;AAC/E,+EAA2E;AAC3E,8DAA8D;AAE9D,SAA8B,aAAa,CACzC,IAAS,EACT,MAAsC;;QAEtC,MAAM,UAAU,GAAG,IAAI,8BAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,QAAQ,GAAG,IAAI,qCAAgB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,WAAW,GAAG,IAAI,0BAAW,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAE1D,MAAM,SAAS,GAAG,IAAA,iCAAmB,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,IAAI,kCAAe,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACzD,MAAM,UAAU,GAAG,EAAS,CAAC;QAC7B,MAAM,WAAW,GAAG,IAAA,4BAAc,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACvD,MAAM,GAAG,GAAG,IAAI,2BAAW,CACzB,QAAQ,EACR,UAAU,EACV,IAAI,CAAC,aAAa,EAClB,WAAW,CACZ,CAAC;QAEF,UAAU,CAAC,GAAS,EAAE;YACpB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAC;YACvC,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,CAAC,CAC5C,CACF,CAAC;gBACF,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAC;aAC7C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;gBAClD,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACf,OAAO;aACR;YAED,KAAK,MAAM,IAAI,IAAI,WAAW,CAAC,YAAY,EAAE;gBAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CACvB,CAAC;gBACF,IAAI,CAAC,YAAY,EAAE;oBACjB,MAAM,IAAI,KAAK,CAAC,kBAAkB,IAAI,iBAAiB,CAAC,CAAC;iBAC1D;gBACD,YAAY,CAAC,iBAAiB,GAAG,IAAI,CAAC;aACvC;YAED,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YACrC,yBAAyB;YACzB,IAAI;gBACF,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,MAAM,CAC1B,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,IAAI,CAAC,MAAM,CAAC,cAAc,EAC1B,IAAI,CAAC,MAAM,CAAC,MAAM,CACnB,CAAC;gBACF,IAAI,CAAC,GAAG,EAAE;oBACR,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAU,CAAC,CAAC;iBACtC;gBACD,MAAM,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAC;aAC3C;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;gBACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAChB;YACD,MAAM,IAAA,gCAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,CAAC,CAAA,EAAE,CAAC,CAAC,CAAC;QAEN,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAhED,gCAgEC"}
|
|
@@ -29,7 +29,7 @@ const nxCloudTasksRunner = (tasks, options, context) => {
|
|
|
29
29
|
if (noAccessTokenDefined || noCloud) {
|
|
30
30
|
return tasksRunner(tasks, options, context);
|
|
31
31
|
}
|
|
32
|
-
if (environment_1.
|
|
32
|
+
if ((0, environment_1.nxInvokedByRunner)()) {
|
|
33
33
|
if (anyCacheableTargets(tasks, options)) {
|
|
34
34
|
return (0, cloud_enabled_runner_1.cloudEnabledTasksRunner)(tasks, options, context, true);
|
|
35
35
|
}
|
|
@@ -37,12 +37,12 @@ const nxCloudTasksRunner = (tasks, options, context) => {
|
|
|
37
37
|
return tasksRunner(tasks, options, context);
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
if (environment_1.
|
|
40
|
+
if ((0, environment_1.agentRunningInDistributedExecution)()) {
|
|
41
41
|
verifyAllOperationsAreCacheableOnAgent(tasks, options);
|
|
42
42
|
}
|
|
43
43
|
// distributed execution, main job
|
|
44
44
|
if ((0, distributed_task_execution_detection_1.isDistributedExecutionEnabled)(nxArgs['dte']) &&
|
|
45
|
-
!environment_1.
|
|
45
|
+
!(0, environment_1.agentRunningInDistributedExecution)()) {
|
|
46
46
|
verifyAllOperationsAreCacheableOnMainJob(tasks, options);
|
|
47
47
|
if (runnerReturnsPromise) {
|
|
48
48
|
return dtePromiseVersion(tasks, options, context);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":";;;;;;;;;;;AACA,yDAKiC;AACjC,6CAA+E;AAC/E,4FAA4F;AAE5F,2GAAiG;AAEjG,MAAM,EACJ,WAAW,EACX,MAAM,EACN,oBAAoB,GACrB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAEtC,MAAM,kBAAkB,GAAQ,CAC9B,KAAa,EACb,OAA+B,EAC/B,OAAY,EACP,EAAE;IACP,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAE9B,MAAM,oBAAoB,GAAG,CAAC,0BAAY,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC;IACnE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,KAAK,IAAI,OAAO,CAAC,WAAW,CAAC;IAEjE,IAAI,OAAO,CAAC,WAAW,EAAE;QACvB,MAAM,CAAC,IAAI,CAAC;YACV,KAAK,EACH,0EAA0E;YAC5E,SAAS,EAAE;gBACT,uEAAuE;aACxE;SACF,CAAC,CAAC;KACJ;IAED,IAAI,oBAAoB,IAAI,OAAO,EAAE;QACnC,OAAO,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAQ,CAAC;KACpD;IAED,IAAI,
|
|
1
|
+
{"version":3,"file":"nx-cloud-tasks-runner.js","sourceRoot":"","sources":["../../../../../libs/nx-packages/nx-cloud/lib/nx-cloud-tasks-runner.ts"],"names":[],"mappings":"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"}
|
package/lib/utilities/axios.js
CHANGED
|
@@ -71,7 +71,7 @@ function axiosMultipleTries(axiosCallCreator, retriesLeft = environment_1.NUMBER
|
|
|
71
71
|
}
|
|
72
72
|
else {
|
|
73
73
|
const retryAfter = 1000 +
|
|
74
|
-
(environment_1.NUMBER_OF_AXIOS_RETRIES + 1 - retriesLeft) *
|
|
74
|
+
(environment_1.NUMBER_OF_AXIOS_RETRIES + 1 - retriesLeft) * 4000 * Math.random();
|
|
75
75
|
if (environment_1.VERBOSE_LOGGING) {
|
|
76
76
|
output.note({
|
|
77
77
|
title: `Received ${code}. Retrying in ${retryAfter}ms.`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/axios.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAMuB;AACvB,qCAAgC;AAGhC,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE3C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAE/B,MAAa,cAAc;IACzB,YACkB,IAA2B,EAC3B,OAAe,EACf,cAAmB;QAFnB,SAAI,GAAJ,IAAI,CAAuB;QAC3B,YAAO,GAAP,OAAO,CAAQ;QACf,mBAAc,GAAd,cAAc,CAAK;IAClC,CAAC;CACL;AAND,wCAMC;AAED,SAAgB,sBAAsB,CAAC,OAA+B;IACpE,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,sBAAsB,CAAC;IACtD,MAAM,WAAW,GAAG,0BAAY,CAAC,CAAC,CAAC,0BAAY,CAAC,CAAC,CAAC,OAAO,CAAC,WAAY,CAAC;IAEvE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,6GAA6G,CAC9G,CAAC;KACH;IAED,OAAO,KAAK,CAAC,MAAM,CAAC;QAClB,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,kCAAoB,CAAC,CAAC,CAAC,+BAAiB,CAAC,CAAC,CAAC,KAAK;QACzD,OAAO,EAAE,EAAE,aAAa,EAAE,WAAW,EAAE;KACxC,CAAC,CAAC;AACL,CAAC;AAfD,wDAeC;AAED,SAAsB,aAAa,CAAC,WAAmB,EAAE,QAAkB;;QACzE,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QACrB,MAAM,GAAG,GAAG,MAAM,QAAQ,EAAE,CAAC;QAC7B,MAAM,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC;QAErB,IAAI,6BAAe,EAAE;YACnB,OAAO,CAAC,GAAG,CAAC,GAAG,WAAW,KAAK,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;SAC7D;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAVD,sCAUC;AAED,SAAsB,kBAAkB,CACtC,gBAAoC,EACpC,WAAW,GAAG,qCAAuB;;QAErC,IAAI;YACF,OAAO,MAAM,gBAAgB,EAAE,CAAC;SACjC;QAAC,OAAO,CAAM,EAAE;YACf,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YAEzD,mEAAmE;YACnE,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE;gBAChC,WAAW,GAAG,CAAC,CAAC;aACjB;YAED,IAAI,WAAW,KAAK,CAAC,EAAE;gBACrB,IAAI,OAAO,GAAG,CAAC,CAAC,QAAQ;oBACtB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO;wBACvB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO;wBACzB,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI;oBACnB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;gBACd,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAC/B,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC;iBACrB;gBACD,MAAM,IAAI,cAAc,CACtB,SAAS,EACT,4CAA4C,IAAI,YAAY,OAAO,GAAG,EACtE,CAAC,CACF,CAAC;aACH;iBAAM;gBACL,MAAM,UAAU,GACd,IAAI;oBACJ,CAAC,qCAAuB,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,
|
|
1
|
+
{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/axios.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,16 @@ export declare const UNLIMITED_FILE_SIZE: number;
|
|
|
8
8
|
export declare const NX_CLOUD_UNLIMITED_OUTPUT: boolean;
|
|
9
9
|
export declare const DEFAULT_FILE_SIZE_LIMIT: number;
|
|
10
10
|
export declare const DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = 166;
|
|
11
|
-
export declare const NX_INVOKED_BY_RUNNER: boolean;
|
|
12
|
-
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_ID: string | undefined;
|
|
13
|
-
export declare const AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION: boolean;
|
|
14
|
-
export declare const NUMBER_OF_AXIOS_RETRIES: number;
|
|
15
11
|
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT: number | null;
|
|
16
12
|
export declare const NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE: boolean;
|
|
17
13
|
export declare const NX_CLOUD_FORCE_METRICS: boolean;
|
|
14
|
+
export declare const NUMBER_OF_AXIOS_RETRIES: number;
|
|
18
15
|
export declare let ACCESS_TOKEN: any;
|
|
19
16
|
export declare let ENCRYPTION_KEY: any;
|
|
20
17
|
export declare let VERBOSE_LOGGING: any;
|
|
21
18
|
export declare let NX_CLOUD_NO_TIMEOUTS: any;
|
|
19
|
+
export declare function agentRunningInDistributedExecution(): boolean;
|
|
20
|
+
export declare function nxInvokedByRunner(): boolean;
|
|
22
21
|
export declare function extractGitSha(): string | undefined;
|
|
23
22
|
export declare function getRunGroup(): string | undefined;
|
|
24
23
|
export declare function getBranch(): string | null;
|
|
@@ -1,14 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getNxCacheDirectory = exports.parseCommand = exports.getMachineInfo = exports.getBranch = exports.getRunGroup = exports.extractGitSha = exports.
|
|
3
|
+
exports.getNxCacheDirectory = exports.parseCommand = exports.getMachineInfo = exports.getBranch = exports.getRunGroup = exports.extractGitSha = exports.nxInvokedByRunner = exports.agentRunningInDistributedExecution = exports.NX_CLOUD_NO_TIMEOUTS = exports.VERBOSE_LOGGING = exports.ENCRYPTION_KEY = exports.ACCESS_TOKEN = exports.NUMBER_OF_AXIOS_RETRIES = exports.NX_CLOUD_FORCE_METRICS = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE = exports.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT = exports.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = exports.DEFAULT_FILE_SIZE_LIMIT = exports.NX_CLOUD_UNLIMITED_OUTPUT = exports.UNLIMITED_FILE_SIZE = exports.NO_COMPLETED_TASKS_TIMEOUT = exports.NO_MESSAGES_TIMEOUT = exports.UNLIMITED_TIMEOUT = exports.NX_DEFAULT_CACHE_LOCATION = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
5
|
const dotenv = require("dotenv");
|
|
6
6
|
const fs_1 = require("fs");
|
|
7
|
-
const node_machine_id_1 = require("node-machine-id");
|
|
8
7
|
const path_1 = require("path");
|
|
9
|
-
const distributed_task_execution_detection_1 = require("./distributed-task-execution-detection");
|
|
10
8
|
const is_ci_1 = require("./is-ci");
|
|
11
9
|
const { workspaceRoot } = require('./nx-imports');
|
|
10
|
+
// Set once
|
|
12
11
|
exports.NX_DEFAULT_CACHE_LOCATION = './node_modules/.cache/nx';
|
|
13
12
|
exports.UNLIMITED_TIMEOUT = 9999999;
|
|
14
13
|
exports.NO_MESSAGES_TIMEOUT = process.env.NX_CLOUD_AGENT_TIMEOUT_MS
|
|
@@ -22,24 +21,27 @@ exports.UNLIMITED_FILE_SIZE = 1000 * 1000 * 10000;
|
|
|
22
21
|
exports.NX_CLOUD_UNLIMITED_OUTPUT = process.env.NX_CLOUD_UNLIMITED_OUTPUT === 'true';
|
|
23
22
|
exports.DEFAULT_FILE_SIZE_LIMIT = 1000 * 1000 * 300;
|
|
24
23
|
exports.DISTRIBUTED_TASK_EXECUTION_INTERNAL_ERROR_STATUS_CODE = 166;
|
|
25
|
-
exports.NX_INVOKED_BY_RUNNER = process.env.NX_INVOKED_BY_RUNNER === 'true' ||
|
|
26
|
-
process.env.NX_CLOUD === 'false';
|
|
27
|
-
exports.NX_CLOUD_DISTRIBUTED_EXECUTION_ID = process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
28
|
-
exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION = !!exports.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
29
|
-
exports.NUMBER_OF_AXIOS_RETRIES = process.env.NX_CLOUD_NUMBER_OF_RETRIES
|
|
30
|
-
? Number(process.env.NX_CLOUD_NUMBER_OF_RETRIES)
|
|
31
|
-
: (0, distributed_task_execution_detection_1.isDistributedExecutionEnabled)(undefined) ||
|
|
32
|
-
exports.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION ||
|
|
33
|
-
(0, is_ci_1.isCI)()
|
|
34
|
-
? 10
|
|
35
|
-
: 1;
|
|
36
24
|
exports.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT = process.env
|
|
37
25
|
.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT
|
|
38
26
|
? Number(process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_AGENT_COUNT)
|
|
39
27
|
: null;
|
|
40
28
|
exports.NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE = process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_STOP_AGENTS_ON_FAILURE != 'false';
|
|
41
29
|
exports.NX_CLOUD_FORCE_METRICS = process.env.NX_CLOUD_FORCE_METRICS === 'true';
|
|
30
|
+
exports.NUMBER_OF_AXIOS_RETRIES = process.env.NX_CLOUD_NUMBER_OF_RETRIES
|
|
31
|
+
? Number(process.env.NX_CLOUD_NUMBER_OF_RETRIES)
|
|
32
|
+
: (0, is_ci_1.isCI)()
|
|
33
|
+
? 10
|
|
34
|
+
: 1;
|
|
42
35
|
loadEnvVars();
|
|
36
|
+
function agentRunningInDistributedExecution() {
|
|
37
|
+
return !!process.env.NX_CLOUD_DISTRIBUTED_EXECUTION_ID;
|
|
38
|
+
}
|
|
39
|
+
exports.agentRunningInDistributedExecution = agentRunningInDistributedExecution;
|
|
40
|
+
function nxInvokedByRunner() {
|
|
41
|
+
return (process.env.NX_INVOKED_BY_RUNNER === 'true' ||
|
|
42
|
+
process.env.NX_CLOUD === 'false');
|
|
43
|
+
}
|
|
44
|
+
exports.nxInvokedByRunner = nxInvokedByRunner;
|
|
43
45
|
function extractGitSha() {
|
|
44
46
|
try {
|
|
45
47
|
return (0, child_process_1.execSync)(`git rev-parse HEAD`, { stdio: 'pipe' }).toString().trim();
|
|
@@ -164,16 +166,8 @@ function getBranch() {
|
|
|
164
166
|
exports.getBranch = getBranch;
|
|
165
167
|
function getMachineInfo(options) {
|
|
166
168
|
const os = require('os');
|
|
167
|
-
let machineId = '';
|
|
168
|
-
// TODO: vsavkin remove it
|
|
169
|
-
if (options.canTrackAnalytics) {
|
|
170
|
-
try {
|
|
171
|
-
machineId = (0, node_machine_id_1.machineIdSync)();
|
|
172
|
-
}
|
|
173
|
-
catch (_a) { }
|
|
174
|
-
}
|
|
175
169
|
return {
|
|
176
|
-
machineId,
|
|
170
|
+
machineId: '',
|
|
177
171
|
platform: os.platform(),
|
|
178
172
|
version: os.version ? os.version() : '',
|
|
179
173
|
cpuCores: os.cpus().length,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/environment.ts"],"names":[],"mappings":";;;AAAA,iDAAyC;AACzC,iCAAiC;AACjC,2BAAkC;
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/environment.ts"],"names":[],"mappings":"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"}
|
package/lib/utilities/is-ci.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare function isCI():
|
|
1
|
+
export declare function isCI(): boolean;
|
package/lib/utilities/is-ci.js
CHANGED
|
@@ -4,18 +4,18 @@ exports.isCI = void 0;
|
|
|
4
4
|
function isCI() {
|
|
5
5
|
return (process.env.CI === 'true' ||
|
|
6
6
|
process.env.TF_BUILD === 'true' ||
|
|
7
|
-
process.env
|
|
7
|
+
process.env.GITHUB_ACTIONS === 'true' ||
|
|
8
8
|
process.env.BUILDKITE === 'true' ||
|
|
9
9
|
process.env.CIRCLECI === 'true' ||
|
|
10
10
|
process.env.CIRRUS_CI === 'true' ||
|
|
11
|
-
process.env.
|
|
12
|
-
process.env.
|
|
13
|
-
process.env.
|
|
14
|
-
process.env.
|
|
15
|
-
process.env.
|
|
16
|
-
process.env.
|
|
17
|
-
process.env.
|
|
18
|
-
process.env.
|
|
11
|
+
process.env.TRAVIS === 'true' ||
|
|
12
|
+
!!process.env['bamboo.buildKey'] ||
|
|
13
|
+
!!process.env.CODEBUILD_BUILD_ID ||
|
|
14
|
+
!!process.env.GITLAB_CI ||
|
|
15
|
+
!!process.env.HEROKU_TEST_RUN_ID ||
|
|
16
|
+
!!process.env.BUILD_ID ||
|
|
17
|
+
!!process.env.BUILD_BUILDID ||
|
|
18
|
+
!!process.env.TEAMCITY_VERSION);
|
|
19
19
|
}
|
|
20
20
|
exports.isCI = isCI;
|
|
21
21
|
//# sourceMappingURL=is-ci.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"is-ci.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/is-ci.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI;IAClB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;QACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QAC/B,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"is-ci.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/is-ci.ts"],"names":[],"mappings":";;;AAAA,SAAgB,IAAI;IAClB,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,EAAE,KAAK,MAAM;QACzB,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QAC/B,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM;QACrC,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM;QAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QAC/B,OAAO,CAAC,GAAG,CAAC,SAAS,KAAK,MAAM;QAChC,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM;QAC7B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS;QACvB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,kBAAkB;QAChC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ;QACtB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa;QAC3B,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAC/B,CAAC;AACJ,CAAC;AAjBD,oBAiBC"}
|
|
@@ -17,7 +17,10 @@ function unparse(options) {
|
|
|
17
17
|
}
|
|
18
18
|
exports.unparse = unparse;
|
|
19
19
|
function unparseOption(key, value, unparsed) {
|
|
20
|
-
if (
|
|
20
|
+
if (key === '_') {
|
|
21
|
+
unparsed.push(...value);
|
|
22
|
+
}
|
|
23
|
+
else if (value === true) {
|
|
21
24
|
unparsed.push(`--${key}`);
|
|
22
25
|
}
|
|
23
26
|
else if (value === false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializer-overrides.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/serializer-overrides.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;QACjD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAJD,gDAIC;AAED,SAAgB,OAAO,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;KACrC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,0BAQC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAU,EAAE,QAAkB;IAChE,IAAI,KAAK,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"serializer-overrides.js","sourceRoot":"","sources":["../../../../../../libs/nx-packages/nx-cloud/lib/utilities/serializer-overrides.ts"],"names":[],"mappings":";;;AAEA,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,sBAAsB;QAC1C,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC;QACjD,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAJD,gDAIC;AAED,SAAgB,OAAO,CAAC,OAAe;IACrC,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3B,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;KACrC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AARD,0BAQC;AAED,SAAS,aAAa,CAAC,GAAW,EAAE,KAAU,EAAE,QAAkB;IAChE,IAAI,GAAG,KAAK,GAAG,EAAE;QACf,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;KACzB;SAAM,IAAI,KAAK,KAAK,IAAI,EAAE;QACzB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC;KAC3B;SAAM,IAAI,KAAK,KAAK,KAAK,EAAE;QAC1B,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC;KAC9B;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;KAC7D;SAAM,IACL,OAAO,KAAK,KAAK,QAAQ;QACzB,+BAA+B,CAAC,KAAK,CAAC,EACtC;QACA,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAA,IAAI,CAAC,CAAC;QACtD,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,KAAK,SAAS,GAAG,CAAC,CAAC;KAC1C;SAAM,IAAI,KAAK,IAAI,IAAI,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC,CAAC;KACpC;AACH,CAAC;AAED,SAAS,+BAA+B,CAAC,GAAW;IAClD,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACrE,CAAC"}
|