@otwld/workflow-cli 0.1.36 → 0.1.37
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/cli.d.ts +7 -0
- package/src/cli.js +25 -0
- package/src/cli.js.map +1 -1
- package/src/main.js +24 -2
- package/src/main.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.37",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"dependencies": {
|
|
19
19
|
"@nx/docker": "23.2.1",
|
|
20
20
|
"@nx/js": "23.2.1",
|
|
21
|
-
"@otwld/nx-helm": "0.0.20-staging
|
|
21
|
+
"@otwld/nx-helm": "0.0.20-staging.1",
|
|
22
22
|
"nx": "23.2.1"
|
|
23
23
|
},
|
|
24
24
|
"engines": {
|
package/src/cli.d.ts
CHANGED
|
@@ -17,6 +17,13 @@ export type CommandInput = {
|
|
|
17
17
|
/** Whether to include additional Nx diagnostics in the inspection output. */
|
|
18
18
|
verbose?: boolean;
|
|
19
19
|
};
|
|
20
|
+
/**
|
|
21
|
+
* Adds BuildKit registry cache to the Docker builds in a release workflow.
|
|
22
|
+
* @param operation - Workflow CLI command.
|
|
23
|
+
* @param environment - Registry host and repository from the release job.
|
|
24
|
+
* @returns Docker flags forwarded to each Nx build task.
|
|
25
|
+
*/
|
|
26
|
+
export declare function dockerBuildCacheArgs(operation: string | undefined, environment: NodeJS.ProcessEnv): string[];
|
|
20
27
|
/**
|
|
21
28
|
* Parses workflow arguments and environment fallbacks into validated inputs.
|
|
22
29
|
* @param argv - Positional command and command-line flags.
|
package/src/cli.js
CHANGED
|
@@ -7,6 +7,31 @@ const flagToEnvironment = {
|
|
|
7
7
|
};
|
|
8
8
|
const shaPattern = /^[0-9a-f]{7,64}$/i;
|
|
9
9
|
const branchPattern = /^[A-Za-z0-9][A-Za-z0-9._/-]*$/;
|
|
10
|
+
/**
|
|
11
|
+
* Adds BuildKit registry cache to the Docker builds in a release workflow.
|
|
12
|
+
* @param operation - Workflow CLI command.
|
|
13
|
+
* @param environment - Registry host and repository from the release job.
|
|
14
|
+
* @returns Docker flags forwarded to each Nx build task.
|
|
15
|
+
*/
|
|
16
|
+
export function dockerBuildCacheArgs(operation, environment) {
|
|
17
|
+
if (operation !== 'stage' && operation !== 'release') {
|
|
18
|
+
return [];
|
|
19
|
+
}
|
|
20
|
+
const host = environment.OCI_REGISTRY_HOST;
|
|
21
|
+
const repository = environment.GITHUB_REPOSITORY?.toLowerCase().match(/^[a-z0-9-]+\/([a-z0-9][a-z0-9._-]*)$/)?.[1];
|
|
22
|
+
if (!host || !/^[a-z0-9][a-z0-9.:-]*$/.test(host) || !repository) {
|
|
23
|
+
return [];
|
|
24
|
+
}
|
|
25
|
+
// Nx sets the project name in the environment of each build task.
|
|
26
|
+
const ref = `${host}/${repository}/build-cache/$NX_TASK_TARGET_PROJECT:buildkit`;
|
|
27
|
+
return [
|
|
28
|
+
'--progress=plain',
|
|
29
|
+
`--cache-from=type=registry,ref=${ref}`,
|
|
30
|
+
...(operation === 'stage'
|
|
31
|
+
? [`--cache-to=type=registry,ref=${ref},mode=max,ignore-error=true`]
|
|
32
|
+
: []),
|
|
33
|
+
];
|
|
34
|
+
}
|
|
10
35
|
/**
|
|
11
36
|
* Parses workflow arguments and environment fallbacks into validated inputs.
|
|
12
37
|
* @param argv - Positional command and command-line flags.
|
package/src/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/cli.ts"],"names":[],"mappings":"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"}
|
package/src/main.js
CHANGED
|
@@ -4,13 +4,14 @@ import { readFile } from 'node:fs/promises';
|
|
|
4
4
|
import { createRequire } from 'node:module';
|
|
5
5
|
import { promisify } from 'node:util';
|
|
6
6
|
import { releaseChangelog, releasePublish, releaseVersion } from 'nx/release';
|
|
7
|
-
import { parseCommand } from './cli.js';
|
|
7
|
+
import { dockerBuildCacheArgs, parseCommand } from './cli.js';
|
|
8
8
|
import { isStableProjectTag } from './git-tags.js';
|
|
9
9
|
import { isRequestedNxProject } from './project-shape.js';
|
|
10
10
|
import { runWorkflow } from './workflow.js';
|
|
11
11
|
const execute = promisify(execFile);
|
|
12
12
|
const require = createRequire(import.meta.url);
|
|
13
13
|
const nxCli = require.resolve('nx/bin/nx.js');
|
|
14
|
+
const workflowArgs = process.argv.slice(2);
|
|
14
15
|
// Workflow validation must inspect the checked-out workspace, not a daemon
|
|
15
16
|
// graph that may have survived from another job on a self-hosted runner.
|
|
16
17
|
process.env.NX_DAEMON = 'false';
|
|
@@ -133,15 +134,36 @@ const dependencies = {
|
|
|
133
134
|
},
|
|
134
135
|
async runTarget(target, projects, options) {
|
|
135
136
|
const targets = Array.isArray(target) ? target : [target];
|
|
137
|
+
const cacheArgs = target === 'docker:build'
|
|
138
|
+
? dockerBuildCacheArgs(workflowArgs[0], process.env)
|
|
139
|
+
: [];
|
|
140
|
+
if (cacheArgs.length > 0 && !(await hasDockerContainerdImageStore())) {
|
|
141
|
+
cacheArgs.length = 0;
|
|
142
|
+
process.stderr.write('BuildKit registry cache skipped: Docker containerd image store unavailable.\n');
|
|
143
|
+
}
|
|
136
144
|
await streamCommand(process.execPath, [
|
|
137
145
|
nxCli,
|
|
138
146
|
'run-many',
|
|
139
147
|
`--targets=${targets.join(',')}`,
|
|
140
148
|
`--projects=${projects.join(',')}`,
|
|
141
149
|
...(Array.isArray(target) ? ['--nxBail=false'] : []),
|
|
150
|
+
...cacheArgs,
|
|
142
151
|
], options);
|
|
143
152
|
},
|
|
144
153
|
};
|
|
154
|
+
async function hasDockerContainerdImageStore() {
|
|
155
|
+
try {
|
|
156
|
+
const storage = await command('docker', [
|
|
157
|
+
'info',
|
|
158
|
+
'--format',
|
|
159
|
+
'{{json .DriverStatus}}',
|
|
160
|
+
]);
|
|
161
|
+
return storage.includes('io.containerd.snapshotter.v1');
|
|
162
|
+
}
|
|
163
|
+
catch {
|
|
164
|
+
return false;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
145
167
|
function streamCommand(binary, arguments_, options) {
|
|
146
168
|
return new Promise((resolve, reject) => {
|
|
147
169
|
const child = spawn(binary, arguments_, {
|
|
@@ -169,7 +191,7 @@ async function nxProjectNames(arguments_) {
|
|
|
169
191
|
return result;
|
|
170
192
|
}
|
|
171
193
|
try {
|
|
172
|
-
await runWorkflow(parseCommand(
|
|
194
|
+
await runWorkflow(parseCommand(workflowArgs, process.env), dependencies);
|
|
173
195
|
}
|
|
174
196
|
catch (error) {
|
|
175
197
|
const message = error instanceof Error ? error.message : String(error);
|
package/src/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/main.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../../apps/workflow-cli/src/main.ts"],"names":[],"mappings":"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"}
|