@otwld/workflow-cli 0.1.4 → 0.1.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/package.json +2 -2
- package/src/index.d.ts +1 -1
- package/src/index.js +1 -1
- package/src/index.js.map +1 -1
- package/src/project-graph.d.ts +1 -0
- package/src/project-graph.js +28 -10
- package/src/project-graph.js.map +1 -1
- package/src/project-shape.d.ts +3 -0
- package/src/project-shape.js +9 -4
- package/src/project-shape.js.map +1 -1
- package/src/workflow.d.ts +3 -0
- package/src/workflow.js +84 -10
- package/src/workflow.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@otwld/workflow-cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@nx/docker": "23.1.1",
|
|
20
20
|
"@nx/js": "23.1.1",
|
|
21
|
-
"@otwld/nx-helm": "0.0.
|
|
21
|
+
"@otwld/nx-helm": "0.0.12",
|
|
22
22
|
"nx": "23.1.1"
|
|
23
23
|
},
|
|
24
24
|
"engines": {
|
package/src/index.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { parseCommand, parseProjectsFile } from './cli.js';
|
|
2
|
-
export { assertChartCohortClosure, parseNxProjectGraph, } from './project-graph.js';
|
|
2
|
+
export { assertChartCohortClosure, parseNxProjectGraph, selectedChartCohorts, } from './project-graph.js';
|
|
3
3
|
export type { NxProjectGraph } from './project-graph.js';
|
|
4
4
|
export { runWorkflow } from './workflow.js';
|
|
5
5
|
export type { WorkflowDependencies } from './workflow.js';
|
package/src/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export { parseCommand, parseProjectsFile } from './cli.js';
|
|
2
|
-
export { assertChartCohortClosure, parseNxProjectGraph, } from './project-graph.js';
|
|
2
|
+
export { assertChartCohortClosure, parseNxProjectGraph, selectedChartCohorts, } from './project-graph.js';
|
|
3
3
|
export { runWorkflow } from './workflow.js';
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,wBAAwB,EACxB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EACL,wBAAwB,EACxB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
|
package/src/project-graph.d.ts
CHANGED
|
@@ -11,4 +11,5 @@ type NxProjectGraphDependency = {
|
|
|
11
11
|
};
|
|
12
12
|
export declare function parseNxProjectGraph(value: unknown): NxProjectGraph;
|
|
13
13
|
export declare function assertChartCohortClosure(requested: readonly string[], graph: NxProjectGraph): void;
|
|
14
|
+
export declare function selectedChartCohorts(requested: readonly string[], graph: NxProjectGraph): string[][];
|
|
14
15
|
export {};
|
package/src/project-graph.js
CHANGED
|
@@ -35,16 +35,7 @@ export function parseNxProjectGraph(value) {
|
|
|
35
35
|
return { nodes: parsedNodes, dependencies: parsedDependencies };
|
|
36
36
|
}
|
|
37
37
|
export function assertChartCohortClosure(requested, graph) {
|
|
38
|
-
const chartProjects =
|
|
39
|
-
const chartNeighbors = new Map([...chartProjects].map((name) => [name, new Set()]));
|
|
40
|
-
for (const edges of graph.dependencies.values()) {
|
|
41
|
-
for (const { source, target } of edges) {
|
|
42
|
-
if (!chartProjects.has(source) || !chartProjects.has(target))
|
|
43
|
-
continue;
|
|
44
|
-
chartNeighbors.get(source)?.add(target);
|
|
45
|
-
chartNeighbors.get(target)?.add(source);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
38
|
+
const { chartProjects, chartNeighbors } = chartTopology(graph);
|
|
48
39
|
const requestedSet = new Set(requested);
|
|
49
40
|
const issues = requested
|
|
50
41
|
.filter((project) => chartProjects.has(project))
|
|
@@ -61,6 +52,33 @@ export function assertChartCohortClosure(requested, graph) {
|
|
|
61
52
|
throw new Error(`Selected chart projects are not closed over the Helm dependency cohort: ${issues.join('; ')}.`);
|
|
62
53
|
}
|
|
63
54
|
}
|
|
55
|
+
export function selectedChartCohorts(requested, graph) {
|
|
56
|
+
const { chartProjects, chartNeighbors } = chartTopology(graph);
|
|
57
|
+
const visited = new Set();
|
|
58
|
+
const result = [];
|
|
59
|
+
for (const project of requested) {
|
|
60
|
+
if (!chartProjects.has(project) || visited.has(project))
|
|
61
|
+
continue;
|
|
62
|
+
const members = cohort(project, chartNeighbors);
|
|
63
|
+
const selected = requested.filter((name) => members.has(name));
|
|
64
|
+
selected.forEach((name) => visited.add(name));
|
|
65
|
+
result.push(selected);
|
|
66
|
+
}
|
|
67
|
+
return result;
|
|
68
|
+
}
|
|
69
|
+
function chartTopology(graph) {
|
|
70
|
+
const chartProjects = new Set([...graph.nodes].flatMap(([name, node]) => node.tags.includes('artifact:oci-chart') ? [name] : []));
|
|
71
|
+
const chartNeighbors = new Map([...chartProjects].map((name) => [name, new Set()]));
|
|
72
|
+
for (const edges of graph.dependencies.values()) {
|
|
73
|
+
for (const { source, target } of edges) {
|
|
74
|
+
if (!chartProjects.has(source) || !chartProjects.has(target))
|
|
75
|
+
continue;
|
|
76
|
+
chartNeighbors.get(source)?.add(target);
|
|
77
|
+
chartNeighbors.get(target)?.add(source);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
return { chartProjects, chartNeighbors };
|
|
81
|
+
}
|
|
64
82
|
function cohort(project, chartNeighbors) {
|
|
65
83
|
const members = new Set();
|
|
66
84
|
const pending = [project];
|
package/src/project-graph.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/project-graph.ts"],"names":[],"mappings":"AAcA,MAAM,mBAAmB,GAAG,gDAAgD,CAAC;AAE7E,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;QAAE,MAAM,YAAY,EAAE,CAAC;IACrE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC;IAC5C,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;QAAE,MAAM,YAAY,EAAE,CAAC;IAEtE,MAAM,WAAW,GAAG,IAAI,GAAG,EAA8B,CAAC;IAC1D,KAAK,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACjD,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC;YACf,IAAI,CAAC,IAAI,KAAK,IAAI;YAClB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;YACpB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,EACvD,CAAC;YACD,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAG/B,CAAC;IACJ,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3D,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,MAAM,YAAY,EAAE,CAAC;QACvB,CAAC;QACD,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACrC,IACE,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACf,IAAI,CAAC,MAAM,KAAK,MAAM;gBACtB,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ;gBAC/B,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAC7B,CAAC;gBACD,MAAM,YAAY,EAAE,CAAC;YACvB,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IAC9C,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,kBAAkB,EAAE,CAAC;AAClE,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,SAA4B,EAC5B,KAAqB;IAErB,MAAM,aAAa,GAAG,IAAI,GAAG,
|
|
1
|
+
{"version":3,"file":"project-graph.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/project-graph.ts"],"names":[],"mappings":"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"}
|
package/src/project-shape.d.ts
CHANGED
package/src/project-shape.js
CHANGED
|
@@ -10,10 +10,15 @@ export function isRequestedNxProject(value, requestedName) {
|
|
|
10
10
|
if (value.metadata !== undefined && !isRecord(value.metadata))
|
|
11
11
|
return false;
|
|
12
12
|
const js = isRecord(value.metadata) ? value.metadata.js : undefined;
|
|
13
|
-
|
|
14
|
-
(isRecord(js)
|
|
15
|
-
(js.packageVersion
|
|
16
|
-
typeof js.packageVersion
|
|
13
|
+
if (js !== undefined &&
|
|
14
|
+
(!isRecord(js) ||
|
|
15
|
+
(js.packageVersion !== undefined &&
|
|
16
|
+
typeof js.packageVersion !== 'string')))
|
|
17
|
+
return false;
|
|
18
|
+
const helm = isRecord(value.metadata) ? value.metadata.helm : undefined;
|
|
19
|
+
return (helm === undefined ||
|
|
20
|
+
(isRecord(helm) &&
|
|
21
|
+
(helm.version === undefined || typeof helm.version === 'string')));
|
|
17
22
|
}
|
|
18
23
|
function isRecord(value) {
|
|
19
24
|
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
package/src/project-shape.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-shape.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/project-shape.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"project-shape.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/project-shape.ts"],"names":[],"mappings":"AAUA,MAAM,UAAU,oBAAoB,CAClC,KAAc,EACd,aAAqB;IAErB,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1E,IACE,KAAK,CAAC,IAAI,KAAK,SAAS;QACxB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;YACzB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC;QAEtD,OAAO,KAAK,CAAC;IACf,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IAC5E,MAAM,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACpE,IACE,EAAE,KAAK,SAAS;QAChB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;YACZ,CAAC,EAAE,CAAC,cAAc,KAAK,SAAS;gBAC9B,OAAO,EAAE,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC;QAE3C,OAAO,KAAK,CAAC;IACf,MAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,OAAO,CACL,IAAI,KAAK,SAAS;QAClB,CAAC,QAAQ,CAAC,IAAI,CAAC;YACb,CAAC,IAAI,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CACpE,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC"}
|
package/src/workflow.d.ts
CHANGED
package/src/workflow.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { parseProjectsFile } from './cli.js';
|
|
2
|
-
import { assertChartCohortClosure, } from './project-graph.js';
|
|
2
|
+
import { assertChartCohortClosure, selectedChartCohorts, } from './project-graph.js';
|
|
3
3
|
export async function runWorkflow(input, dependencies) {
|
|
4
4
|
if (input.command === 'stage') {
|
|
5
5
|
const affected = await dependencies.affectedProjects(input.baseSha, input.sourceSha);
|
|
@@ -18,7 +18,8 @@ export async function runWorkflow(input, dependencies) {
|
|
|
18
18
|
throw new Error(`Unknown Nx project: ${project}.`);
|
|
19
19
|
}
|
|
20
20
|
}
|
|
21
|
-
|
|
21
|
+
const projectGraph = await dependencies.projectGraph();
|
|
22
|
+
assertChartCohortClosure(requested, projectGraph);
|
|
22
23
|
const projects = await releaseable(requested, dependencies);
|
|
23
24
|
if (projects.length !== requested.length) {
|
|
24
25
|
throw new Error('Every selected project must expose the nx-release-publish capability.');
|
|
@@ -30,9 +31,13 @@ export async function runWorkflow(input, dependencies) {
|
|
|
30
31
|
? initialized
|
|
31
32
|
: firstRelease).push(project);
|
|
32
33
|
}
|
|
34
|
+
const firstReleasePlans = firstReleaseTransactions(firstRelease, initialized, selectedChartCohorts(requested, projectGraph)).map((transaction) => ({
|
|
35
|
+
projects: transaction.map((project) => project.name),
|
|
36
|
+
baseline: firstReleaseBaseline(transaction),
|
|
37
|
+
}));
|
|
33
38
|
let expectedHead = input.sourceSha;
|
|
34
|
-
for (const
|
|
35
|
-
expectedHead = await runStableTransaction(
|
|
39
|
+
for (const plan of firstReleasePlans) {
|
|
40
|
+
expectedHead = await runStableTransaction(plan.projects, true, plan.baseline, input.defaultBranch, expectedHead, dependencies);
|
|
36
41
|
}
|
|
37
42
|
if (initialized.length > 0) {
|
|
38
43
|
await runStableTransaction(initialized.map((project) => project.name), false, undefined, input.defaultBranch, expectedHead, dependencies);
|
|
@@ -106,13 +111,82 @@ function artifactFamily(project) {
|
|
|
106
111
|
throw new Error(`Project ${project.name} has an unsupported artifact identity.`);
|
|
107
112
|
}
|
|
108
113
|
}
|
|
109
|
-
function
|
|
110
|
-
const
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
+
function firstReleaseTransactions(firstRelease, initialized, chartCohorts) {
|
|
115
|
+
const projects = new Map([...firstRelease, ...initialized].map((project) => [project.name, project]));
|
|
116
|
+
const firstNames = new Set(firstRelease.map((project) => project.name));
|
|
117
|
+
const initializedNames = new Set(initialized.map((project) => project.name));
|
|
118
|
+
const cohortByProject = new Map();
|
|
119
|
+
for (const chartCohort of chartCohorts) {
|
|
120
|
+
const hasFirst = chartCohort.some((name) => firstNames.has(name));
|
|
121
|
+
const hasInitialized = chartCohort.some((name) => initializedNames.has(name));
|
|
122
|
+
if (hasFirst && hasInitialized) {
|
|
123
|
+
throw new Error(`Helm dependency cohort has mixed first-release state: ${chartCohort.join(',')}.`);
|
|
124
|
+
}
|
|
125
|
+
if (hasFirst)
|
|
126
|
+
chartCohort.forEach((name) => cohortByProject.set(name, chartCohort));
|
|
127
|
+
}
|
|
128
|
+
const visited = new Set();
|
|
129
|
+
return firstRelease.flatMap((project) => {
|
|
130
|
+
if (visited.has(project.name))
|
|
131
|
+
return [];
|
|
132
|
+
const names = cohortByProject.get(project.name) ?? [project.name];
|
|
133
|
+
const transaction = names.map((name) => projects.get(name));
|
|
134
|
+
if (transaction.some((member) => member === undefined)) {
|
|
135
|
+
throw new Error('Helm dependency cohort contains an unselected project.');
|
|
136
|
+
}
|
|
137
|
+
names.forEach((name) => visited.add(name));
|
|
138
|
+
return [transaction];
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
function firstReleaseBaseline(projects) {
|
|
142
|
+
const baselines = new Set(projects.map(stableSourceVersion));
|
|
143
|
+
if (baselines.size !== 1) {
|
|
144
|
+
throw new Error(`First release transaction ${projects.map((project) => project.name).join(',')} must share one stable version baseline.`);
|
|
114
145
|
}
|
|
115
|
-
return
|
|
146
|
+
return [...baselines][0];
|
|
147
|
+
}
|
|
148
|
+
function stableSourceVersion(project) {
|
|
149
|
+
const family = artifactFamily(project);
|
|
150
|
+
const sourceVersion = family === 'helm'
|
|
151
|
+
? project.metadata?.helm?.version
|
|
152
|
+
: project.metadata?.js?.packageVersion;
|
|
153
|
+
const stableVersion = sourceVersion === undefined
|
|
154
|
+
? undefined
|
|
155
|
+
: semanticVersionCore(sourceVersion);
|
|
156
|
+
if (!stableVersion) {
|
|
157
|
+
throw new Error(`First release project ${project.name} is missing a valid provider-owned version baseline.`);
|
|
158
|
+
}
|
|
159
|
+
return stableVersion;
|
|
160
|
+
}
|
|
161
|
+
function semanticVersionCore(version) {
|
|
162
|
+
const buildSeparator = version.indexOf('+');
|
|
163
|
+
if (buildSeparator !== -1 && version.indexOf('+', buildSeparator + 1) !== -1)
|
|
164
|
+
return undefined;
|
|
165
|
+
const withoutBuild = buildSeparator === -1 ? version : version.slice(0, buildSeparator);
|
|
166
|
+
const build = buildSeparator === -1 ? undefined : version.slice(buildSeparator + 1);
|
|
167
|
+
const prereleaseSeparator = withoutBuild.indexOf('-');
|
|
168
|
+
const core = prereleaseSeparator === -1
|
|
169
|
+
? withoutBuild
|
|
170
|
+
: withoutBuild.slice(0, prereleaseSeparator);
|
|
171
|
+
const prerelease = prereleaseSeparator === -1
|
|
172
|
+
? undefined
|
|
173
|
+
: withoutBuild.slice(prereleaseSeparator + 1);
|
|
174
|
+
if (!/^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)$/.test(core))
|
|
175
|
+
return undefined;
|
|
176
|
+
if (prerelease !== undefined && !validIdentifiers(prerelease, false))
|
|
177
|
+
return undefined;
|
|
178
|
+
if (build !== undefined && !validIdentifiers(build, true))
|
|
179
|
+
return undefined;
|
|
180
|
+
return core;
|
|
181
|
+
}
|
|
182
|
+
function validIdentifiers(value, allowNumericLeadingZero) {
|
|
183
|
+
return value.split('.').every((identifier) => {
|
|
184
|
+
if (!/^[0-9A-Za-z-]+$/.test(identifier))
|
|
185
|
+
return false;
|
|
186
|
+
if (allowNumericLeadingZero || !/^\d+$/.test(identifier))
|
|
187
|
+
return true;
|
|
188
|
+
return identifier === '0' || !identifier.startsWith('0');
|
|
189
|
+
});
|
|
116
190
|
}
|
|
117
191
|
async function ensureCurrentSource(defaultBranch, expectedHead, dependencies) {
|
|
118
192
|
const [remoteHead, checkoutHead] = await Promise.all([
|
package/src/workflow.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAqB,MAAM,UAAU,CAAC;AAChE,OAAO,EACL,wBAAwB,
|
|
1
|
+
{"version":3,"file":"workflow.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/workflow.ts"],"names":[],"mappings":"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"}
|