@nrwl/nx-cloud 13.0.0-beta.1 → 13.0.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.d.ts +2 -2
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js +2 -2
- package/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.js.map +1 -1
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js +12 -12
- package/lib/core/runners/cloud-enabled/cloud-enabled.runner.js.map +1 -1
- package/lib/core/terminal-output/end-of-run-message.d.ts +2 -2
- package/lib/core/terminal-output/end-of-run-message.js +3 -3
- package/lib/core/terminal-output/end-of-run-message.js.map +1 -1
- package/package.json +1 -1
|
@@ -10,11 +10,11 @@ export declare class CloudEnabledLifeCycle {
|
|
|
10
10
|
private readonly cacheableOperations;
|
|
11
11
|
private readonly outputObfuscator;
|
|
12
12
|
private readonly endOfRunMessage;
|
|
13
|
+
private readonly tasks;
|
|
13
14
|
private static MAX_CHARACTERS_FAILED_TASK;
|
|
14
15
|
private static MAX_CHARACTERS_SUCCESSFUL_TASK;
|
|
15
16
|
private static MAX_CHARACTERS_CACHED_TASK;
|
|
16
|
-
|
|
17
|
-
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator, endOfRunMessage: EndOfRunMessage);
|
|
17
|
+
constructor(runContext: RunContext, cacheDirectory: string | undefined, collectTerminalOutput: boolean, cacheableOperations: string[], outputObfuscator: OutputObfuscator, endOfRunMessage: EndOfRunMessage, tasks: TaskExecution[]);
|
|
18
18
|
scheduleTask(task: Task): void;
|
|
19
19
|
startTask(task: Task): void;
|
|
20
20
|
endTask(task: Task, code: number): void;
|
|
@@ -7,14 +7,14 @@ const app_root_1 = require("@nrwl/workspace/src/utils/app-root");
|
|
|
7
7
|
const fs_1 = require("fs");
|
|
8
8
|
const path = require("path");
|
|
9
9
|
class CloudEnabledLifeCycle {
|
|
10
|
-
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, endOfRunMessage) {
|
|
10
|
+
constructor(runContext, cacheDirectory, collectTerminalOutput, cacheableOperations, outputObfuscator, endOfRunMessage, tasks) {
|
|
11
11
|
this.runContext = runContext;
|
|
12
12
|
this.cacheDirectory = cacheDirectory;
|
|
13
13
|
this.collectTerminalOutput = collectTerminalOutput;
|
|
14
14
|
this.cacheableOperations = cacheableOperations;
|
|
15
15
|
this.outputObfuscator = outputObfuscator;
|
|
16
16
|
this.endOfRunMessage = endOfRunMessage;
|
|
17
|
-
this.tasks =
|
|
17
|
+
this.tasks = tasks;
|
|
18
18
|
}
|
|
19
19
|
scheduleTask(task) {
|
|
20
20
|
this.runContext.scheduledTasks.push(task);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":";;;AACA,kEAAiE;AACjE,+BAA4B;AAC5B,iEAAiE;AACjE,2BAAkC;AAClC,6BAA6B;AAM7B,MAAa,qBAAqB;
|
|
1
|
+
{"version":3,"file":"cloud-enabled-life-cycle.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled-life-cycle.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,11 +41,11 @@ function storeTaskHashes(taskExecutions, directory) {
|
|
|
41
41
|
}
|
|
42
42
|
(0, fs_1.writeFileSync)(path.join(directory, 'tasks-hashes'), hashes);
|
|
43
43
|
}
|
|
44
|
-
function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage) {
|
|
44
|
+
function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions) {
|
|
45
45
|
return __awaiter(this, void 0, void 0, function* () {
|
|
46
46
|
const runEndTime = new Date().toISOString();
|
|
47
47
|
if (environment_1.VERBOSE_LOGGING) {
|
|
48
|
-
const tasks =
|
|
48
|
+
const tasks = taskExecutions.map((tt) => {
|
|
49
49
|
return Object.assign(Object.assign({}, tt), { terminalOutput: tt.terminalOutput
|
|
50
50
|
? `${tt.terminalOutput.slice(0, 20)}...`
|
|
51
51
|
: undefined });
|
|
@@ -56,7 +56,7 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
58
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
59
|
-
storeTaskHashes(
|
|
59
|
+
storeTaskHashes(taskExecutions, options.cacheDirectory || './node_modules/.cache/nx');
|
|
60
60
|
}
|
|
61
61
|
const branch = (0, environment_1.getBranch)();
|
|
62
62
|
const endRequest = yield Promise.all([
|
|
@@ -72,10 +72,9 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
72
72
|
// only set sha if branch is set cause we invoke a separate process,
|
|
73
73
|
// which adds a few millis
|
|
74
74
|
sha: branch ? (0, environment_1.extractGitSha)() : undefined,
|
|
75
|
-
},
|
|
75
|
+
}, taskExecutions),
|
|
76
76
|
]);
|
|
77
77
|
messages.printMessages();
|
|
78
|
-
endOfRunMessage.tasks = lifeCycle.tasks;
|
|
79
78
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION) {
|
|
80
79
|
if (!endRequest[0]) {
|
|
81
80
|
output_1.output.error({
|
|
@@ -96,8 +95,8 @@ function onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runS
|
|
|
96
95
|
catch (e) { }
|
|
97
96
|
});
|
|
98
97
|
}
|
|
99
|
-
function createLifeCycle(runContext, options, outputObfuscator, endOfRunMessage) {
|
|
100
|
-
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, options.cacheDirectory, options.scan === undefined ? true : options.scan, options.cacheableOperations || [], outputObfuscator, endOfRunMessage);
|
|
98
|
+
function createLifeCycle(runContext, options, outputObfuscator, endOfRunMessage, tasks) {
|
|
99
|
+
const cloudEnabledLifeCycle = new cloud_enabled_life_cycle_1.CloudEnabledLifeCycle(runContext, options.cacheDirectory, options.scan === undefined ? true : options.scan, options.cacheableOperations || [], outputObfuscator, endOfRunMessage, tasks);
|
|
101
100
|
try {
|
|
102
101
|
const { CompositeLifeCycle, } = require('@nrwl/workspace/src/tasks-runner/life-cycle');
|
|
103
102
|
if (!CompositeLifeCycle)
|
|
@@ -115,9 +114,10 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
115
114
|
requests: {},
|
|
116
115
|
allTasks: tasks,
|
|
117
116
|
};
|
|
117
|
+
const taskExecutions = [];
|
|
118
118
|
const messages = new message_reporter_1.MessageReporter(options);
|
|
119
119
|
const api = createApi(messages, options, runContext);
|
|
120
|
-
const endOfRunMessage = new end_of_run_message_1.EndOfRunMessage(messages, runContext);
|
|
120
|
+
const endOfRunMessage = new end_of_run_message_1.EndOfRunMessage(messages, runContext, taskExecutions);
|
|
121
121
|
const outputObfuscator = new output_obfuscator_1.OutputObfuscator();
|
|
122
122
|
const hashes = tasks.map((t) => t.hash).filter((h) => !!h);
|
|
123
123
|
const startRunRequest = api.startRun(environment_1.NX_CLOUD_DISTRIBUTED_EXECUTION_ID, hashes);
|
|
@@ -125,7 +125,7 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
125
125
|
runContext.requests[hash] = startRunRequest;
|
|
126
126
|
});
|
|
127
127
|
const runStartTime = new Date().toISOString();
|
|
128
|
-
const lifeCycle = createLifeCycle(runContext, options, outputObfuscator, endOfRunMessage);
|
|
128
|
+
const lifeCycle = createLifeCycle(runContext, options, outputObfuscator, endOfRunMessage, taskExecutions);
|
|
129
129
|
const encryption = new e2e_encryption_1.E2EEncryption(environment_1.ENCRYPTION_KEY || options.encryptionKey);
|
|
130
130
|
const fileStorage = new file_storage_1.FileStorage(encryption, environment_1.NUMBER_OF_TRIES);
|
|
131
131
|
const remoteCache = new cloud_remote_cache_1.CloudRemoteCache(messages, api, runContext, fileStorage);
|
|
@@ -139,7 +139,7 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
139
139
|
next: (value) => wrappedRes.next(value),
|
|
140
140
|
error: (err) => wrappedRes.error(err),
|
|
141
141
|
complete: () => __awaiter(this, void 0, void 0, function* () {
|
|
142
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
142
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
143
143
|
wrappedRes.complete();
|
|
144
144
|
}),
|
|
145
145
|
});
|
|
@@ -149,11 +149,11 @@ function cloudEnabledTasksRunner(tasks, options, context) {
|
|
|
149
149
|
else {
|
|
150
150
|
return res
|
|
151
151
|
.then((r) => __awaiter(this, void 0, void 0, function* () {
|
|
152
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
152
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
153
153
|
return r;
|
|
154
154
|
}))
|
|
155
155
|
.catch((e) => __awaiter(this, void 0, void 0, function* () {
|
|
156
|
-
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage);
|
|
156
|
+
yield onComplete(lifeCycle, options, remoteCache, api, outputObfuscator, runStartTime, messages, endOfRunMessage, taskExecutions);
|
|
157
157
|
throw e;
|
|
158
158
|
}));
|
|
159
159
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":";;;;;;;;;;;;AAMA,mDAAgD;AAEhD,6EAAyE;AACzE,iFAA2E;AAC3E,+EAA2E;AAC3E,yEAAmE;AACnE,kEAA8D;AAC9D,sEAAkE;AAClE,gEAYwC;AACxC,6DAAwD;AACxD,sFAAiF;AACjF,iEAA8D;AAC9D,mDAA8C;AAE9C,2BAAmC;AACnC,6BAA6B;AAC7B,oEAAoE;
|
|
1
|
+
{"version":3,"file":"cloud-enabled.runner.js","sourceRoot":"","sources":["../../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/runners/cloud-enabled/cloud-enabled.runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ import { TaskExecution } from '../models/task-execution.model';
|
|
|
4
4
|
export declare class EndOfRunMessage {
|
|
5
5
|
private readonly messages;
|
|
6
6
|
private readonly runContext;
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
private readonly taskExecutions;
|
|
8
|
+
constructor(messages: MessageReporter, runContext: RunContext, taskExecutions: TaskExecution[]);
|
|
9
9
|
private patchReporters;
|
|
10
10
|
printCacheHitsMessage(): void;
|
|
11
11
|
}
|
|
@@ -4,10 +4,10 @@ exports.EndOfRunMessage = void 0;
|
|
|
4
4
|
const environment_1 = require("../../utilities/environment");
|
|
5
5
|
const print_message_1 = require("../../utilities/print-message");
|
|
6
6
|
class EndOfRunMessage {
|
|
7
|
-
constructor(messages, runContext) {
|
|
7
|
+
constructor(messages, runContext, taskExecutions) {
|
|
8
8
|
this.messages = messages;
|
|
9
9
|
this.runContext = runContext;
|
|
10
|
-
this.
|
|
10
|
+
this.taskExecutions = taskExecutions;
|
|
11
11
|
this.patchReporters();
|
|
12
12
|
}
|
|
13
13
|
patchReporters() {
|
|
@@ -47,7 +47,7 @@ class EndOfRunMessage {
|
|
|
47
47
|
return;
|
|
48
48
|
if (environment_1.AGENT_RUNNING_IN_DISTRIBUTED_EXECUTION)
|
|
49
49
|
return;
|
|
50
|
-
const hits = this.
|
|
50
|
+
const hits = this.taskExecutions
|
|
51
51
|
.filter((t) => this.runContext.statuses[t.hash] === 'remote-cache-hit')
|
|
52
52
|
.map((t) => t.projectName);
|
|
53
53
|
if (hits.length === 0 && !this.runContext.runUrl) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":";;;AAGA,6DAAqF;AACrF,iEAA6D;AAE7D,MAAa,eAAe;IAC1B,YACmB,QAAyB,EACzB,UAAsB;
|
|
1
|
+
{"version":3,"file":"end-of-run-message.js","sourceRoot":"","sources":["../../../../../../../libs/nx-packages/nx-cloud/src/lib/core/terminal-output/end-of-run-message.ts"],"names":[],"mappings":"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"}
|