@smoothbricks/nx-plugin 0.4.22 โ 0.4.24
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/README.md +93 -33
- package/dist/bin/smoo-nx-exec.js +35 -11
- package/dist/bin/smoo-nx-nextest-extract.d.ts +3 -0
- package/dist/bin/smoo-nx-nextest-extract.d.ts.map +1 -0
- package/dist/bin/smoo-nx-nextest-extract.js +41 -0
- package/dist/cargo-closure-input.d.ts +63 -0
- package/dist/cargo-closure-input.d.ts.map +1 -0
- package/dist/cargo-closure-input.js +197 -0
- package/dist/cargo-source-hash.d.ts +37 -0
- package/dist/cargo-source-hash.d.ts.map +1 -1
- package/dist/cargo-source-hash.js +108 -190
- package/dist/cross-check-policy.d.ts +14 -0
- package/dist/cross-check-policy.d.ts.map +1 -1
- package/dist/cross-check-policy.js +15 -1
- package/dist/ensure-built.d.ts +3 -2
- package/dist/ensure-built.d.ts.map +1 -1
- package/dist/ensure-built.js +33 -56
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +152 -91
- package/dist/managed-files/ci-workflow.d.ts.map +1 -1
- package/dist/managed-files/ci-workflow.js +12 -15
- package/dist/managed-files/files.d.ts.map +1 -1
- package/dist/managed-files/files.js +10 -0
- package/dist/managed-files/publish-workflow.d.ts.map +1 -1
- package/dist/managed-files/publish-workflow.js +12 -6
- package/dist/manifest-hash.d.ts.map +1 -1
- package/dist/manifest-hash.js +24 -30
- package/dist/nextest-extraction.d.ts +101 -0
- package/dist/nextest-extraction.d.ts.map +1 -0
- package/dist/nextest-extraction.js +268 -0
- package/dist/package-target-policy.js +1 -1
- package/dist/platform-targets.d.ts +7 -0
- package/dist/platform-targets.d.ts.map +1 -1
- package/dist/platform-targets.js +7 -0
- package/dist/workspace-config-policy.d.ts +1 -1
- package/dist/workspace-config-policy.d.ts.map +1 -1
- package/dist/workspace-config-policy.js +1 -1
- package/managed/raw/envrc +38 -1
- package/managed/raw/tooling/direnv/developer-links.ts +201 -0
- package/managed/raw/tooling/direnv/devenv.smoo.nix +75 -51
- package/managed/raw/tooling/direnv/secret-references.ts +3 -1
- package/managed/raw/tooling/direnv/setup-environment.ts +562 -78
- package/managed/raw/tooling/direnv/shared-caches.sh +53 -0
- package/managed/raw/tooling/git-hooks/pre-push.sh +22 -1
- package/managed/templates/github/workflows/managed-files.yml +4 -3
- package/nextest.toml +5 -5
- package/package.json +4 -3
- package/src/__tests__/fixture-nx-env.ts +31 -0
- package/src/__tests__/in-process-nx-index.ts +9 -0
- package/src/bin/smoo-nx-exec.ts +40 -11
- package/src/bin/smoo-nx-nextest-extract.ts +43 -0
- package/src/bounded-test-policy.test.ts +4 -1
- package/src/cargo-closure-input.test.ts +184 -0
- package/src/cargo-closure-input.ts +247 -0
- package/src/cargo-source-hash.test.ts +8 -9
- package/src/cargo-source-hash.ts +146 -47
- package/src/cross-check-policy.ts +15 -3
- package/src/ensure-built.test.ts +65 -5
- package/src/ensure-built.ts +40 -85
- package/src/index.test.ts +222 -75
- package/src/index.ts +213 -101
- package/src/managed-files/ci-workflow.ts +12 -15
- package/src/managed-files/files.ts +10 -0
- package/src/managed-files/generator.test.ts +29 -0
- package/src/managed-files/publish-workflow.ts +17 -6
- package/src/manifest-hash.test.ts +21 -1
- package/src/manifest-hash.ts +26 -29
- package/src/nextest-extraction.test.ts +74 -0
- package/src/nextest-extraction.ts +329 -0
- package/src/package-target-policy.ts +1 -1
- package/src/platform-targets.ts +8 -0
- package/src/workspace-config-policy.ts +6 -1
package/dist/index.js
CHANGED
|
@@ -7,12 +7,14 @@ import { readJsonFile, } from 'nx/src/devkit-exports.js';
|
|
|
7
7
|
import { AggregateCreateNodesError } from 'nx/src/project-graph/error-types.js';
|
|
8
8
|
import { parse as parseToml } from 'smol-toml';
|
|
9
9
|
import { BOUNDED_TEST_KILL_AFTER_MS, BOUNDED_TEST_TIMEOUT_MS } from './bounded-test-policy.js';
|
|
10
|
+
import { CARGO_CLOSURE_INPUT, cargoClosureInputs, indexedCargoManifests, resolveCargoClosureSource, } from './cargo-closure-input.js';
|
|
10
11
|
import { CARGO_TOOLCHAIN_NAMED_INPUT, CARGO_TOOLCHAIN_PIN_INPUTS } from './cargo-toolchain-policy.js';
|
|
11
12
|
import { attributeCargoWorkspacePackages, CARGO_TEST_ARCHIVE_FILE, CARGO_TEST_ARCHIVE_TARGET, CARGO_TEST_COMPILE_TARGET, CARGO_TEST_EXCEPTIONS_SUFFIX, CARGO_TEST_TARGET, cargoPackageTestInputs, cargoTestPackageTargetName, createCargoInputsCache, exceptionalTestFilter, listCargoCrossTestTargets, listCargoWorkspacePackages, NEXTEST_REPO_CONFIG_PATH, nextestToolConfigArg, } from './cargo-workspace.js';
|
|
12
13
|
import { CARGO_CROSS_LINT_COMMAND, CARGO_CROSS_LINT_TARGET, CARGO_FETCH_COMMAND, CARGO_FETCH_TARGET, CARGO_FROZEN_PREFIX, CARGO_LINT_CLIPPY_COMMAND, cargoCrossTestArchiveFile, cargoCrossTestArchiveTargetName, cargoCrossTestTargetName, cargoFrozen, } from './cross-check-policy.js';
|
|
13
14
|
import { hashVersionlessCrateManifests } from './manifest-hash.js';
|
|
15
|
+
import { EXTRACTED_BINARIES_METADATA, EXTRACTED_CARGO_METADATA, EXTRACTED_TARGET_DIR, NEXTEST_EXTRACT_BIN, } from './nextest-extraction.js';
|
|
14
16
|
import { isNonSourceDirectory } from './source-directories.js';
|
|
15
|
-
import { isBuildOutputTargetName, isTestRunnerTargetName, PLATFORM_TARGET_GLOBS } from './workspace-config-policy.js';
|
|
17
|
+
import { isBuildOutputTargetName, isTestRunnerTargetName, PLATFORM_TARGET_GLOBS, RELEASE_CONFIGURATION, } from './workspace-config-policy.js';
|
|
16
18
|
export { CARGO_TEST_COMPILE_TARGET };
|
|
17
19
|
/** Makes a version live and proves it answers; never cached. */
|
|
18
20
|
export const DEPLOY_TARGET = 'deploy';
|
|
@@ -412,13 +414,33 @@ const NAPI_TOOLCHAIN_TARGET_PREFIX = 'napi-toolchain-';
|
|
|
412
414
|
export function napiToolchainTargetName(convention) {
|
|
413
415
|
return `${NAPI_TOOLCHAIN_TARGET_PREFIX}${convention.architecture}-${convention.targetFamily}`;
|
|
414
416
|
}
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
417
|
+
const CARGO_PROFILE_FLAG = { dev: '', release: ' --release' };
|
|
418
|
+
/** The directory under `target/<triple>/` each profile writes. */
|
|
419
|
+
const CARGO_PROFILE_OUTPUT_DIR = { dev: 'debug', release: 'release' };
|
|
420
|
+
/**
|
|
421
|
+
* Cargo's default target directory for a crate, relative to the command's cwd:
|
|
422
|
+
* `target/` beside the workspace root that owns the crate, or beside the
|
|
423
|
+
* crate's own manifest when no workspace claims it. Naming it rather than
|
|
424
|
+
* passing `--target-dir` keeps the wasm build in the directory every other
|
|
425
|
+
* build of the same workspace writes.
|
|
426
|
+
*/
|
|
427
|
+
function cargoWasmTargetDirectory(projectRoot, config, repoRooted, cargoWorkspace) {
|
|
428
|
+
const cwd = repoRooted ? '.' : projectRoot;
|
|
429
|
+
const crateDir = posix.join(cwd, posix.dirname(config.manifestPath));
|
|
430
|
+
const owner = cargoWorkspace !== undefined &&
|
|
431
|
+
cargoWorkspace.packages.some((plan) => posix.join(cargoWorkspace.projectRoot, plan.package.dir) === crateDir)
|
|
432
|
+
? cargoWorkspace.projectRoot
|
|
433
|
+
: crateDir;
|
|
434
|
+
return posix.relative(cwd, posix.join(owner, 'target'));
|
|
435
|
+
}
|
|
436
|
+
function createCargoWasmTarget(projectRoot, config, repoRooted, cargoTargetDirectory) {
|
|
420
437
|
const outputDirectory = repoRooted ? posix.join(projectRoot, config.outputDirectory) : config.outputDirectory;
|
|
421
438
|
const cargoSelection = repoRooted ? `-p ${config.cargoPackage}` : `--manifest-path ${config.manifestPath}`;
|
|
439
|
+
const commands = (profile) => [
|
|
440
|
+
cargoFrozen(`build${CARGO_PROFILE_FLAG[profile]} --target wasm32-unknown-unknown ${cargoSelection}`),
|
|
441
|
+
...config.targets.map(({ bindgenTarget, outputName }) => `wasm-bindgen --target ${bindgenTarget} --out-dir ${outputDirectory}/${outputName} ` +
|
|
442
|
+
`${cargoTargetDirectory}/wasm32-unknown-unknown/${CARGO_PROFILE_OUTPUT_DIR[profile]}/${config.libraryName}.wasm`),
|
|
443
|
+
];
|
|
422
444
|
return {
|
|
423
445
|
executor: 'nx:run-commands',
|
|
424
446
|
cache: true,
|
|
@@ -426,13 +448,11 @@ function createCargoWasmTarget(projectRoot, config, repoRooted) {
|
|
|
426
448
|
inputs: repoRooted ? REPO_ROOT_CARGO_OUTPUT_INPUTS : CARGO_OUTPUT_INPUTS,
|
|
427
449
|
outputs: [`{projectRoot}/${config.outputDirectory}`],
|
|
428
450
|
options: {
|
|
429
|
-
commands:
|
|
430
|
-
cargoFrozen(`build --release --target wasm32-unknown-unknown --target-dir ${cargoTargetDirectory} ${cargoSelection}`),
|
|
431
|
-
...config.targets.map(({ bindgenTarget, outputName }) => `wasm-bindgen --target ${bindgenTarget} --out-dir ${outputDirectory}/${outputName} ${wasmInput}`),
|
|
432
|
-
],
|
|
451
|
+
commands: commands('dev'),
|
|
433
452
|
cwd: repoRooted ? '.' : projectRoot,
|
|
434
453
|
parallel: false,
|
|
435
454
|
},
|
|
455
|
+
configurations: { [RELEASE_CONFIGURATION]: { commands: commands('release') } },
|
|
436
456
|
};
|
|
437
457
|
}
|
|
438
458
|
/**
|
|
@@ -448,13 +468,19 @@ function createCargoWasmTarget(projectRoot, config, repoRooted) {
|
|
|
448
468
|
* timeout. Inference serializes writers that share the default target dir
|
|
449
469
|
* (`napi-debug` after compile).
|
|
450
470
|
*
|
|
451
|
-
* Clippy
|
|
452
|
-
*
|
|
453
|
-
*
|
|
454
|
-
*
|
|
455
|
-
*
|
|
456
|
-
*
|
|
457
|
-
*
|
|
471
|
+
* Clippy runs ONCE over the whole workspace, in that same `target/`, rather
|
|
472
|
+
* than once per crate. Clippy of a crate is a check build of its whole
|
|
473
|
+
* closure, so 49 crates meant 49 closure rebuilds and 11 GiB of target
|
|
474
|
+
* directories on one repository, and no per-crate cache hit ever repaid that.
|
|
475
|
+
* Sharing the build's directory costs nothing: cargo's own lock serializes
|
|
476
|
+
* the invocations that use it, and the host units a dev build compiled are
|
|
477
|
+
* reused instead of compiled again.
|
|
478
|
+
*
|
|
479
|
+
* Tests compile the dev profile only, so no test target carries a
|
|
480
|
+
* RELEASE_CONFIGURATION: Nx forwards a run's configuration down every
|
|
481
|
+
* `dependsOn` edge to each target that has it, and a release `build` must
|
|
482
|
+
* warm the dev test binaries the test run will use, not release ones nobody
|
|
483
|
+
* runs.
|
|
458
484
|
*/
|
|
459
485
|
function createCargoTestCompileTarget(projectRoot) {
|
|
460
486
|
return {
|
|
@@ -466,9 +492,6 @@ function createCargoTestCompileTarget(projectRoot) {
|
|
|
466
492
|
command: cargoFrozen('test --workspace --no-run'),
|
|
467
493
|
cwd: projectRoot,
|
|
468
494
|
},
|
|
469
|
-
configurations: {
|
|
470
|
-
production: { command: cargoFrozen('test --workspace --release --no-run') },
|
|
471
|
-
},
|
|
472
495
|
};
|
|
473
496
|
}
|
|
474
497
|
/**
|
|
@@ -480,30 +503,27 @@ function createCargoTestCompileTarget(projectRoot) {
|
|
|
480
503
|
* build with a filter: 32 such tasks on one repository each re-entered cargo,
|
|
481
504
|
* re-resolved features and chained behind one another so the flocked `target/`
|
|
482
505
|
* had a single writer. Reading from an archive removes the build from the run
|
|
483
|
-
* entirely โ the
|
|
484
|
-
*
|
|
506
|
+
* entirely โ the runners execute one extraction of it and never write cargo's
|
|
507
|
+
* `target/` build tree โ which is what lets the runners fan out.
|
|
485
508
|
*
|
|
486
509
|
* Cached, unlike `cargo-test-compile`, because it produces a VALUE: one file,
|
|
487
510
|
* not a mutable build tree Nx would have to restore. `--workspace` matches the
|
|
488
511
|
* clippy selection exactly, so both gates unify features the same way.
|
|
489
512
|
*/
|
|
490
513
|
function createCargoTestArchiveTarget(projectRoot, toolConfig) {
|
|
491
|
-
const archiveCommand = (profile) => cargoFrozen(`nextest archive --workspace${profile} --archive-file ${CARGO_TEST_ARCHIVE_FILE} --user-config-file none ${toolConfig}`);
|
|
492
514
|
return {
|
|
493
515
|
executor: 'nx:run-commands',
|
|
494
516
|
cache: true,
|
|
495
517
|
inputs: CARGO_INPUTS,
|
|
496
518
|
outputs: [`{projectRoot}/${CARGO_TEST_ARCHIVE_FILE}`],
|
|
497
519
|
options: {
|
|
498
|
-
commands: [
|
|
520
|
+
commands: [
|
|
521
|
+
`mkdir -p ${posix.dirname(CARGO_TEST_ARCHIVE_FILE)}`,
|
|
522
|
+
cargoFrozen(`nextest archive --workspace --archive-file ${CARGO_TEST_ARCHIVE_FILE} --user-config-file none ${toolConfig}`),
|
|
523
|
+
],
|
|
499
524
|
cwd: projectRoot,
|
|
500
525
|
parallel: false,
|
|
501
526
|
},
|
|
502
|
-
configurations: {
|
|
503
|
-
production: {
|
|
504
|
-
commands: [`mkdir -p ${posix.dirname(CARGO_TEST_ARCHIVE_FILE)}`, archiveCommand(' --release')],
|
|
505
|
-
},
|
|
506
|
-
},
|
|
507
527
|
};
|
|
508
528
|
}
|
|
509
529
|
/**
|
|
@@ -539,8 +559,6 @@ function createCargoTestArchiveTarget(projectRoot, toolConfig) {
|
|
|
539
559
|
function createCargoCrossTestTargets(projectRoot, toolConfig, crossTarget, archiveInputs) {
|
|
540
560
|
const { target: triple, cargo } = crossTarget;
|
|
541
561
|
const archiveFile = cargoCrossTestArchiveFile(triple);
|
|
542
|
-
const archiveCommand = (profile) => `cargo-nextest nextest archive --workspace${profile} --target ${triple} --frozen ` +
|
|
543
|
-
`--archive-file ${archiveFile} --user-config-file none ${toolConfig}`;
|
|
544
562
|
return {
|
|
545
563
|
[cargoCrossTestArchiveTargetName(triple)]: {
|
|
546
564
|
executor: 'nx:run-commands',
|
|
@@ -565,7 +583,11 @@ function createCargoCrossTestTargets(projectRoot, toolConfig, crossTarget, archi
|
|
|
565
583
|
outputs: [`{projectRoot}/${archiveFile}`],
|
|
566
584
|
dependsOn: [CARGO_FETCH_TARGET],
|
|
567
585
|
options: {
|
|
568
|
-
commands: [
|
|
586
|
+
commands: [
|
|
587
|
+
`mkdir -p ${posix.dirname(archiveFile)}`,
|
|
588
|
+
`cargo-nextest nextest archive --workspace --target ${triple} --frozen ` +
|
|
589
|
+
`--archive-file ${archiveFile} --user-config-file none ${toolConfig}`,
|
|
590
|
+
],
|
|
569
591
|
cwd: projectRoot,
|
|
570
592
|
parallel: false,
|
|
571
593
|
// `CARGO` is cargo's own driver variable and the only seam nextest
|
|
@@ -576,11 +598,6 @@ function createCargoCrossTestTargets(projectRoot, toolConfig, crossTarget, archi
|
|
|
576
598
|
// it applies to this archive and to nothing else cargo runs.
|
|
577
599
|
...(cargo === undefined ? {} : { env: { CARGO: cargo } }),
|
|
578
600
|
},
|
|
579
|
-
configurations: {
|
|
580
|
-
production: {
|
|
581
|
-
commands: [`mkdir -p ${posix.dirname(archiveFile)}`, archiveCommand(' --release')],
|
|
582
|
-
},
|
|
583
|
-
},
|
|
584
601
|
},
|
|
585
602
|
[cargoCrossTestTargetName(triple)]: {
|
|
586
603
|
executor: '@smoothbricks/nx-plugin:bounded-exec',
|
|
@@ -595,9 +612,6 @@ function createCargoCrossTestTargets(projectRoot, toolConfig, crossTarget, archi
|
|
|
595
612
|
timeoutMs: BOUNDED_TEST_TIMEOUT_MS,
|
|
596
613
|
killAfterMs: BOUNDED_TEST_KILL_AFTER_MS,
|
|
597
614
|
},
|
|
598
|
-
// The archive already holds the profile it was built with, and nextest
|
|
599
|
-
// rejects `--release` beside `--archive-file`.
|
|
600
|
-
configurations: { production: {} },
|
|
601
615
|
},
|
|
602
616
|
};
|
|
603
617
|
}
|
|
@@ -613,9 +627,6 @@ function createCargoTestTarget(projectRoot) {
|
|
|
613
627
|
timeoutMs: BOUNDED_TEST_TIMEOUT_MS,
|
|
614
628
|
killAfterMs: BOUNDED_TEST_KILL_AFTER_MS,
|
|
615
629
|
},
|
|
616
|
-
configurations: {
|
|
617
|
-
production: { command: cargoFrozen('test --workspace --release') },
|
|
618
|
-
},
|
|
619
630
|
};
|
|
620
631
|
}
|
|
621
632
|
const PLUGIN_NEXTEST_CONFIG = fileURLToPath(new URL('../nextest.toml', import.meta.url));
|
|
@@ -692,6 +703,9 @@ function createNodesHandler(hostPlatform) {
|
|
|
692
703
|
errors.push([packageJsonPath, error instanceof Error ? error : new Error(String(error))]);
|
|
693
704
|
}
|
|
694
705
|
}));
|
|
706
|
+
// A project that failed before reaching its closure never awaited Cargo;
|
|
707
|
+
// no process this call started may outlive it.
|
|
708
|
+
await Promise.all(cargoWorkspaces.map((workspace) => workspace.closureSource));
|
|
695
709
|
if (errors.length > 0) {
|
|
696
710
|
throw new AggregateCreateNodesError(errors, results);
|
|
697
711
|
}
|
|
@@ -897,7 +911,7 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
897
911
|
validationTargets.push('typecheck');
|
|
898
912
|
}
|
|
899
913
|
if (inferCargoWasm && cargoWasmConfig) {
|
|
900
|
-
targets['cargo-wasm'] = createCargoWasmTarget(projectRoot, cargoWasmConfig, isRepoRootedCargoProject);
|
|
914
|
+
targets['cargo-wasm'] = createCargoWasmTarget(projectRoot, cargoWasmConfig, isRepoRootedCargoProject, cargoWasmTargetDirectory(projectRoot, cargoWasmConfig, isRepoRootedCargoProject, cargoWorkspace));
|
|
901
915
|
}
|
|
902
916
|
if (napiConfig) {
|
|
903
917
|
Object.assign(targets, createNapiTargets(projectRoot, napiConfig, hostPlatform, isRepoRootedCargoProject));
|
|
@@ -998,12 +1012,13 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
998
1012
|
aggregateDependencies.length > 0
|
|
999
1013
|
? { executor: 'nx:noop', cache: true, outputs: [], dependsOn: aggregateDependencies }
|
|
1000
1014
|
: createCargoTestTarget(cargoWorkspaceRoot);
|
|
1001
|
-
// One clippy over the whole workspace, in
|
|
1002
|
-
// is a check build of its closure; a target dir per crate
|
|
1003
|
-
// shared dependency once per crate (49 closures, 11 GiB on
|
|
1004
|
-
// and no per-crate cache hit ever repaid that. The
|
|
1005
|
-
// exactly the union of every crate's, so the verdict
|
|
1006
|
-
// key set the compile does. Non-root packages depend on
|
|
1015
|
+
// One clippy over the whole workspace, in the build's target dir. Clippy
|
|
1016
|
+
// of a crate is a check build of its closure; a target dir per crate
|
|
1017
|
+
// compiled every shared dependency once per crate (49 closures, 11 GiB on
|
|
1018
|
+
// one repository) and no per-crate cache hit ever repaid that. The
|
|
1019
|
+
// workspace inputs are exactly the union of every crate's, so the verdict
|
|
1020
|
+
// caches on the same key set the compile does. Non-root packages depend on
|
|
1021
|
+
// this target.
|
|
1007
1022
|
targets['cargo-lint'] = {
|
|
1008
1023
|
executor: 'nx:run-commands',
|
|
1009
1024
|
cache: true,
|
|
@@ -1120,7 +1135,6 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
1120
1135
|
const target = targets[name];
|
|
1121
1136
|
if (target?.executor === 'nx:noop') {
|
|
1122
1137
|
target.outputs = [];
|
|
1123
|
-
target.configurations = { production: {} };
|
|
1124
1138
|
}
|
|
1125
1139
|
}
|
|
1126
1140
|
}
|
|
@@ -1291,7 +1305,7 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
1291
1305
|
// The platform binaries therefore stay Nx siblings of cargo-test-compile and
|
|
1292
1306
|
// serialize on cargo's flock instead of on a graph edge. That is the same
|
|
1293
1307
|
// arrangement `cli-<arch>-<os>` and `napi-<arch>-<os>` already have with each
|
|
1294
|
-
// other โ both `napi build
|
|
1308
|
+
// other โ both `napi build` on one target dir โ so this adds a third
|
|
1295
1309
|
// participant to an existing wait, not a new hazard. The flock makes them wait;
|
|
1296
1310
|
// it does not corrupt anything, and these are unbounded `nx:run-commands`
|
|
1297
1311
|
// targets, so the wait is not charged against a test budget.
|
|
@@ -1398,11 +1412,11 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
1398
1412
|
}
|
|
1399
1413
|
// Every cargo build directory this project's own commands write. `clean`
|
|
1400
1414
|
// cannot learn them from `outputs`: a clippy or nextest target dir is a
|
|
1401
|
-
// multi-GB build tree that must never enter the Nx cache
|
|
1402
|
-
// alone was 11 GiB when each of 49 crates had its own), so the targets
|
|
1415
|
+
// multi-GB build tree that must never enter the Nx cache, so the targets
|
|
1403
1416
|
// deliberately declare `outputs: []`. Reading `--target-dir` back off the
|
|
1404
1417
|
// commands means the list cannot drift from what actually gets written, and a
|
|
1405
1418
|
// directory is named relative to the command's own cwd, not the project root.
|
|
1419
|
+
// The workspace's default `target/` is not listed: every dev build shares it.
|
|
1406
1420
|
const cargoBuildDirs = [
|
|
1407
1421
|
...new Set(Object.entries(targets).flatMap(([name, target]) => {
|
|
1408
1422
|
const cwd = target.options?.cwd;
|
|
@@ -1483,6 +1497,18 @@ async function createProjectTargets(packageJsonPath, workspaceRoot, hostPlatform
|
|
|
1483
1497
|
? { [CARGO_TOOLCHAIN_NAMED_INPUT]: [...CARGO_TOOLCHAIN_PIN_INPUTS] }
|
|
1484
1498
|
: {}),
|
|
1485
1499
|
};
|
|
1500
|
+
// A custom Cargo target names this instead of a hand-kept crate list or a
|
|
1501
|
+
// per-project runtime command: Cargo decides the closure once per graph
|
|
1502
|
+
// computation and Nx hashes its files from its own index. Defined for a
|
|
1503
|
+
// project with a workspace crate under its root โ the same projects the
|
|
1504
|
+
// `--closure <projectRoot>` command could describe.
|
|
1505
|
+
const closureSources = cargoWorkspaces.filter((workspace) => workspace.packages.some(({ package: pkg }) => {
|
|
1506
|
+
const crate = posix.join(workspace.projectRoot, pkg.dir);
|
|
1507
|
+
return projectRoot === '.' || crate === projectRoot || crate.startsWith(`${projectRoot}/`);
|
|
1508
|
+
}));
|
|
1509
|
+
if (closureSources.length > 0) {
|
|
1510
|
+
namedInputs[CARGO_CLOSURE_INPUT] = await cargoClosureInputs(projectRoot, await Promise.all(closureSources.map((workspace) => workspace.closureSource)));
|
|
1511
|
+
}
|
|
1486
1512
|
return {
|
|
1487
1513
|
projects: {
|
|
1488
1514
|
[projectRoot]: {
|
|
@@ -1669,13 +1695,14 @@ function createNapiTargets(projectRoot, config, hostPlatform, repoRooted) {
|
|
|
1669
1695
|
}
|
|
1670
1696
|
const targets = {};
|
|
1671
1697
|
const hostCompilerEnv = napiCompilerEnv(hostPlatform, hostPlatform);
|
|
1672
|
-
// The addon the test suite loads. A dev
|
|
1673
|
-
//
|
|
1674
|
-
//
|
|
1675
|
-
//
|
|
1676
|
-
//
|
|
1677
|
-
// dist/ would ship. native.ts resolves this
|
|
1678
|
-
// napi-test target sets NAPI_DEBUG_ADDON=1, so
|
|
1698
|
+
// The addon the test suite loads. A plain dev build shares target/debug with
|
|
1699
|
+
// cargo-test's dependency graph, so after the tests compile this is nearly
|
|
1700
|
+
// free, where a `--target <triple>` platform build compiles the graph again
|
|
1701
|
+
// under target/<triple>/. The output lives OUTSIDE dist/ because packages
|
|
1702
|
+
// publish `files: ["dist"]` wholesale: an addon the test run wrote under
|
|
1703
|
+
// dist/ would ship in place of the release build. native.ts resolves this
|
|
1704
|
+
// directory only when the napi-test target sets NAPI_DEBUG_ADDON=1, so
|
|
1705
|
+
// production loads never see it.
|
|
1679
1706
|
targets['napi-debug'] = {
|
|
1680
1707
|
executor: 'nx:run-commands',
|
|
1681
1708
|
cache: true,
|
|
@@ -1690,9 +1717,12 @@ function createNapiTargets(projectRoot, config, hostPlatform, repoRooted) {
|
|
|
1690
1717
|
};
|
|
1691
1718
|
if (nativeHostTargetName === null) {
|
|
1692
1719
|
// The platform target for this host triple is the same compilation, so a
|
|
1693
|
-
// second cargo-napi invocation only buys a duplicate dependency graph
|
|
1694
|
-
//
|
|
1695
|
-
//
|
|
1720
|
+
// second cargo-napi invocation only buys a duplicate dependency graph
|
|
1721
|
+
// (a plain build and a `--target` build write different target/
|
|
1722
|
+
// subdirectories); native.ts already resolves the identical
|
|
1723
|
+
// platform-suffixed filename from dist/native/<platform-dir> after
|
|
1724
|
+
// dist/native/host.
|
|
1725
|
+
const hostBuild = (profile) => `${napiCommand} build${CARGO_PROFILE_FLAG[profile]} --platform --no-js --dts ${config.binaryName}.napi.d.ts ${commonCommand} --output-dir ${outputPath('dist/native/host')}`;
|
|
1696
1726
|
targets['cargo-napi'] = {
|
|
1697
1727
|
executor: 'nx:run-commands',
|
|
1698
1728
|
cache: true,
|
|
@@ -1701,9 +1731,10 @@ function createNapiTargets(projectRoot, config, hostPlatform, repoRooted) {
|
|
|
1701
1731
|
outputs: ['{projectRoot}/dist/native/host'],
|
|
1702
1732
|
options: {
|
|
1703
1733
|
cwd: cargoCwd,
|
|
1704
|
-
command:
|
|
1734
|
+
command: hostBuild('dev'),
|
|
1705
1735
|
...(hostCompilerEnv ? { env: hostCompilerEnv } : {}),
|
|
1706
1736
|
},
|
|
1737
|
+
configurations: { [RELEASE_CONFIGURATION]: { command: hostBuild('release') } },
|
|
1707
1738
|
};
|
|
1708
1739
|
}
|
|
1709
1740
|
for (const triple of config.targets) {
|
|
@@ -1735,6 +1766,7 @@ function createNapiTargets(projectRoot, config, hostPlatform, repoRooted) {
|
|
|
1735
1766
|
const useNapiCross = usesNapiCross(convention, hostPlatform);
|
|
1736
1767
|
const crossFlag = useNapiCross ? ' --use-napi-cross' : '';
|
|
1737
1768
|
const compilerEnv = napiCompilerEnv(convention, hostPlatform);
|
|
1769
|
+
const platformBuild = (profile) => `${napiCommand} build${CARGO_PROFILE_FLAG[profile]} --platform --no-js --dts ${config.binaryName}.${convention.outputName}.d.ts --target ${triple}${crossFlag} ${commonCommand} --output-dir ${outputPath(outputDirectory)}`;
|
|
1738
1770
|
targets[targetName] = {
|
|
1739
1771
|
executor: 'nx:run-commands',
|
|
1740
1772
|
cache: true,
|
|
@@ -1743,12 +1775,13 @@ function createNapiTargets(projectRoot, config, hostPlatform, repoRooted) {
|
|
|
1743
1775
|
outputs: [`{projectRoot}/${outputDirectory}`],
|
|
1744
1776
|
options: {
|
|
1745
1777
|
cwd: cargoCwd,
|
|
1746
|
-
command:
|
|
1778
|
+
command: platformBuild('dev'),
|
|
1747
1779
|
// Genuine Linux cross-compiles use Clang plus napi-rs's downloaded
|
|
1748
1780
|
// GNU sysroot. A native Linux target uses Nix's cc wrapper so C build
|
|
1749
1781
|
// scripts resolve the host libc headers instead.
|
|
1750
1782
|
...(compilerEnv ? { env: compilerEnv } : {}),
|
|
1751
1783
|
},
|
|
1784
|
+
configurations: { [RELEASE_CONFIGURATION]: { command: platformBuild('release') } },
|
|
1752
1785
|
};
|
|
1753
1786
|
}
|
|
1754
1787
|
return targets;
|
|
@@ -1758,10 +1791,11 @@ function createNapiTestTarget(projectRoot, hasDedicatedBunfig) {
|
|
|
1758
1791
|
return {
|
|
1759
1792
|
executor: '@smoothbricks/nx-plugin:bounded-exec',
|
|
1760
1793
|
cache: true,
|
|
1761
|
-
// Deliberately NOT `build`: the aggregate drags the host-platform
|
|
1762
|
-
//
|
|
1763
|
-
//
|
|
1764
|
-
// napi-debug supplies the addon
|
|
1794
|
+
// Deliberately NOT `build`: the aggregate drags the host-platform binaries
|
|
1795
|
+
// onto the test critical path, and a `--target <triple>` platform build
|
|
1796
|
+
// compiles the whole graph again. tsc-js supplies dist/ts for the suite's
|
|
1797
|
+
// own imports; napi-debug supplies the addon from the graph cargo-test
|
|
1798
|
+
// already built.
|
|
1765
1799
|
dependsOn: ['cargo-test', 'napi-debug', 'tsc-js', '^build'],
|
|
1766
1800
|
options: {
|
|
1767
1801
|
// cwd is src/, not the package root: `bun test <arg>` treats the arg as a
|
|
@@ -1872,7 +1906,7 @@ async function resolveCargoWorkspaces(packageJsonPaths, workspaceRoot) {
|
|
|
1872
1906
|
// createProjectTargets records the path-specific parse failure below.
|
|
1873
1907
|
}
|
|
1874
1908
|
}
|
|
1875
|
-
const
|
|
1909
|
+
const found = [];
|
|
1876
1910
|
for (const rootProject of projects) {
|
|
1877
1911
|
const absoluteRoot = join(workspaceRoot, rootProject.root);
|
|
1878
1912
|
const manifest = join(absoluteRoot, 'Cargo.toml');
|
|
@@ -1908,29 +1942,55 @@ async function resolveCargoWorkspaces(packageJsonPaths, workspaceRoot) {
|
|
|
1908
1942
|
}
|
|
1909
1943
|
packages.push({ package: pkg, pieces });
|
|
1910
1944
|
}
|
|
1911
|
-
|
|
1945
|
+
found.push({
|
|
1912
1946
|
packages,
|
|
1913
1947
|
rootProjectName: rootProject.name,
|
|
1914
1948
|
projectRoot: rootProject.root,
|
|
1915
1949
|
inputsCache: createCargoInputsCache(),
|
|
1916
1950
|
});
|
|
1917
1951
|
}
|
|
1918
|
-
|
|
1952
|
+
if (found.length === 0)
|
|
1953
|
+
return [];
|
|
1954
|
+
// Started only once every workspace listed cleanly, so a listing that throws
|
|
1955
|
+
// leaves no Cargo process behind.
|
|
1956
|
+
const indexedManifests = indexedCargoManifests(workspaceRoot);
|
|
1957
|
+
return found.map((workspace) => ({
|
|
1958
|
+
...workspace,
|
|
1959
|
+
closureSource: resolveCargoClosureSource(posix.join(workspace.projectRoot, 'Cargo.toml'), workspaceRoot, indexedManifests),
|
|
1960
|
+
}));
|
|
1919
1961
|
}
|
|
1920
1962
|
/**
|
|
1921
1963
|
* One bounded target per crate; a crate that declares `smoothbricks.test.shards`
|
|
1922
1964
|
* gets one per shard plus one for the tests nextest.toml singles out.
|
|
1923
1965
|
*
|
|
1924
|
-
* Every piece EXECUTES, it never builds:
|
|
1925
|
-
* `cargo-test-archive` compiled once for the whole workspace
|
|
1926
|
-
* the
|
|
1927
|
-
*
|
|
1928
|
-
*
|
|
1929
|
-
*
|
|
1930
|
-
*
|
|
1931
|
-
*
|
|
1932
|
-
*
|
|
1933
|
-
*
|
|
1966
|
+
* Every piece EXECUTES, it never builds: it runs the binaries
|
|
1967
|
+
* `cargo-test-archive` compiled once for the whole workspace. That is what
|
|
1968
|
+
* removed the two costs the old shape could not avoid. `nextest run --workspace
|
|
1969
|
+
* -E 'package(X)'` re-entered cargo once per crate, and the `-p X` form
|
|
1970
|
+
* re-resolved that crate's features so cargo rebuilt the divergent half inside
|
|
1971
|
+
* the bounded window โ measured at 57.9s of a 120s budget on a hosted 3-core
|
|
1972
|
+
* macOS runner, killing the run with 264 tests still to go. Neither form is
|
|
1973
|
+
* reachable from a reused build: nextest rejects `--workspace` and `-p` beside
|
|
1974
|
+
* it, so the filterset is the only selector left, and it selects the same tests
|
|
1975
|
+
* it always did.
|
|
1976
|
+
*
|
|
1977
|
+
* The archive is unpacked ONCE per content, not once per piece. `nextest run
|
|
1978
|
+
* --archive-file` extracts the whole archive into a temporary directory of its
|
|
1979
|
+
* own on every run, so N pieces paid N extractions of every binary in the
|
|
1980
|
+
* workspace to run 1/N of the tests each: on a workspace with ~200 test
|
|
1981
|
+
* binaries, ~25 runners extracting side by side on a loaded host all hit the
|
|
1982
|
+
* 120s bound still "Extracting". `smoo-nx-nextest-extract` hashes the archive,
|
|
1983
|
+
* unpacks it under that hash unless a previous runner already did โ one
|
|
1984
|
+
* extracts while the rest wait โ and prints the directory; the run then reuses
|
|
1985
|
+
* it through nextest's own reuse-build flags, which is what `--archive-file`
|
|
1986
|
+
* does after unpacking. Keyed by the archive's bytes, so a rebuilt or restored
|
|
1987
|
+
* archive can never run an older extraction's binaries. The one difference
|
|
1988
|
+
* from `--archive-file` is the Rust standard library directory: nextest has no
|
|
1989
|
+
* flag to remap it, so a run uses the producing toolchain's own sysroot rather
|
|
1990
|
+
* than the archived copy of it โ the same toolchain, because the archive's hash
|
|
1991
|
+
* covers the toolchain pin. The extraction lives under `target/nextest`, never
|
|
1992
|
+
* in an Nx output: it is a multi-GB tree for a cached verdict that has no
|
|
1993
|
+
* outputs.
|
|
1934
1994
|
*
|
|
1935
1995
|
* `--workspace-remap .` is not cosmetic. An archive records the ABSOLUTE paths
|
|
1936
1996
|
* of the tree that produced it; without the remap, a restored archive hands
|
|
@@ -1963,12 +2023,17 @@ async function resolveCargoWorkspaces(packageJsonPaths, workspaceRoot) {
|
|
|
1963
2023
|
* making valid empty crates and shards fail execution.
|
|
1964
2024
|
*
|
|
1965
2025
|
* Pieces fan out rather than chain. The chain existed because every runner was
|
|
1966
|
-
* a cargo writer on one flocked `target/`;
|
|
1967
|
-
* so the only serialization left is the one
|
|
2026
|
+
* a cargo writer on one flocked `target/`; a reused-build run writes nothing
|
|
2027
|
+
* there, so the only serialization left is the one extraction per archive.
|
|
1968
2028
|
*/
|
|
1969
2029
|
async function addCargoTestTargets(targets, currentProjectName, projectRoot, workspaceRoot, workspace) {
|
|
1970
2030
|
const targetNames = [];
|
|
1971
2031
|
const toolConfig = nextestToolConfigArg(workspaceRoot, workspace.projectRoot, PLUGIN_NEXTEST_CONFIG);
|
|
2032
|
+
// Relative to the runner's cwd, so the hashed command is the same in every checkout.
|
|
2033
|
+
const extractBin = posix.join(posix.relative(workspace.projectRoot, '.'), NEXTEST_EXTRACT_BIN);
|
|
2034
|
+
const reuseExtraction = `--binaries-metadata "$extracted/${EXTRACTED_BINARIES_METADATA}" ` +
|
|
2035
|
+
`--cargo-metadata "$extracted/${EXTRACTED_CARGO_METADATA}" ` +
|
|
2036
|
+
`--target-dir-remap "$extracted/${EXTRACTED_TARGET_DIR}"`;
|
|
1972
2037
|
for (const plan of workspace.packages) {
|
|
1973
2038
|
if (plan.package.projectRoot !== projectRoot) {
|
|
1974
2039
|
continue;
|
|
@@ -2011,16 +2076,12 @@ async function addCargoTestTargets(targets, currentProjectName, projectRoot, wor
|
|
|
2011
2076
|
inputs,
|
|
2012
2077
|
dependsOn: [archive],
|
|
2013
2078
|
options: {
|
|
2014
|
-
command:
|
|
2079
|
+
command: `extracted="$(node ${extractBin} ${CARGO_TEST_ARCHIVE_FILE})" && ` +
|
|
2080
|
+
cargoFrozen(`nextest run ${reuseExtraction} --workspace-remap . -E '${piece.selector}'${piece.extra} --no-tests=pass --user-config-file none ${toolConfig}`),
|
|
2015
2081
|
cwd: workspace.projectRoot,
|
|
2016
2082
|
timeoutMs: BOUNDED_TEST_TIMEOUT_MS,
|
|
2017
2083
|
killAfterMs: BOUNDED_TEST_KILL_AFTER_MS,
|
|
2018
2084
|
},
|
|
2019
|
-
// The archive already holds the profile it was built with, and nextest
|
|
2020
|
-
// rejects `--release` beside `--archive-file`. Nx propagates the
|
|
2021
|
-
// configuration to this target's dependencies, so `:production` builds
|
|
2022
|
-
// the release archive and this command runs exactly what it finds.
|
|
2023
|
-
configurations: { production: {} },
|
|
2024
2085
|
};
|
|
2025
2086
|
}
|
|
2026
2087
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ci-workflow.d.ts","sourceRoot":"","sources":["../../src/managed-files/ci-workflow.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EACV,aAAa,EACb,6BAA6B,EAE7B,uBAAuB,EACvB,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,EAC7B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAGlC,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;IACrB,eAAe,qBAAqB;IACpC,WAAW,iBAAiB;IAC5B,gBAAgB,sBAAsB;IACtC,SAAS,gBAAgB;IACzB,cAAc,qBAAqB;IACnC,KAAK,UAAU;IACf,YAAY,kBAAkB;IAC9B,IAAI,SAAS;IACb,SAAS,eAAe;IACxB,uBAAuB,8BAA8B;IACrD,iBAAiB,wBAAwB;IACzC,uBAAuB,+BAA+B;IACtD,yBAAyB,iCAAiC;IAC1D,UAAU,gBAAgB;IAC1B,iBAAiB,wBAAwB;IACzC,oBAAoB,2BAA2B;IAC/C,MAAM,WAAW;IACjB,WAAW,kBAAkB;IAC7B,cAAc,qBAAqB;IACnC,aAAa,oBAAoB;CAClC;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,kBAAkB,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED;;;;;;GAMG;AACH,MAAM,WAAW,sBAAsB;IACrC,cAAc,CAAC,EAAE,YAAY,CAAC;IAC9B,wEAAwE;IACxE,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACxC;AAED;;;;;;;;;;GAUG;AACH,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,2BAA4B,SAAQ,sBAAsB;IACzE,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,MAAM,EAAE,OAAO,CAAC;IAChB,YAAY,EAAE,OAAO,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,2EAA2E;IAC3E,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACpC,0CAA0C;IAC1C,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B;;;;;OAKG;IACH,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC;;;;OAIG;IACH,eAAe,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAChD;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD;;;;OAIG;IACH,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC,yGAAyG;IACzG,YAAY,CAAC,EAAE,6BAA6B,CAAC;IAC7C,kFAAkF;IAClF,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,yFAAyF;IACzF,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B;;;;;;;;OAQG;IACH,iBAAiB,CAAC,EAAE,SAAS,kBAAkB,EAAE,CAAC;IAClD;;;;;;;;;;;OAWG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAChC;;;;;;;;;;OAUG;IACH,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;CAC1D;AAID,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,2BAA2B,GAAG,cAAc,EAAE,CAiDvF;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,6DAA6D,CAAC;AAE/F,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,2BAA2B,GAAG,MAAM,CASjF;AAmED,mFAAmF;AACnF,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,2BAA2B,EAAE,YAAY,CAAC,GAAG,MAAM,CAM1G;
|
|
1
|
+
{"version":3,"file":"ci-workflow.d.ts","sourceRoot":"","sources":["../../src/managed-files/ci-workflow.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ export function defineCiWorkflow(options) {
|
|
|
60
60
|
if (options.browserTests) {
|
|
61
61
|
steps.push({ kind: CiWorkflowStepKind.BrowserTests, name: '๐ Browser Tests' });
|
|
62
62
|
}
|
|
63
|
-
steps.push({ kind: CiWorkflowStepKind.ManagedFilesCheck, name: '๐ฉบ Check managed-file drift' }, { kind: CiWorkflowStepKind.ManagedFilesDispatch, name: '๐ Dispatch managed-file drift healing' }, { kind: CiWorkflowStepKind.SaveNxCache, name: '๐พ Save Nx cache' }, { kind: CiWorkflowStepKind.UploadTraceDbs, name: '๐ Upload trace DBs' }, { kind: CiWorkflowStepKind.SaveNixDevenv, name: '๐งน Cleanup and cache Nix/devenv' });
|
|
63
|
+
steps.push({ kind: CiWorkflowStepKind.ManagedFilesCheck, name: '๐ฉบ Check monorepo policies and managed-file drift' }, { kind: CiWorkflowStepKind.ManagedFilesDispatch, name: '๐ Dispatch managed-file drift healing' }, { kind: CiWorkflowStepKind.SaveNxCache, name: '๐พ Save Nx cache' }, { kind: CiWorkflowStepKind.UploadTraceDbs, name: '๐ Upload trace DBs' }, { kind: CiWorkflowStepKind.SaveNixDevenv, name: '๐งน Cleanup and cache Nix/devenv' });
|
|
64
64
|
return steps.map((step, index) => ({ ...step, number: index + 2 }));
|
|
65
65
|
}
|
|
66
66
|
/**
|
|
@@ -314,24 +314,21 @@ function yamlLinesForStep(step, options) {
|
|
|
314
314
|
` run: smoo github-ci nx-run-many --targets "${darwinCrossTestTargetNames(options).join(',')}"`,
|
|
315
315
|
];
|
|
316
316
|
case CiWorkflowStepKind.ManagedFilesCheck:
|
|
317
|
-
//
|
|
318
|
-
//
|
|
319
|
-
// `drifted=<count>` for the dispatch step below.
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
' id: managed-drift',
|
|
323
|
-
' if:',
|
|
324
|
-
" ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}',",
|
|
325
|
-
' github.event.repository.default_branch) }}',
|
|
326
|
-
' run: smoo monorepo check --warn',
|
|
327
|
-
];
|
|
317
|
+
// Runs on every event, pull requests included: the package policies fail the job, since
|
|
318
|
+
// nothing heals them, while --warn keeps managed-file drift non-blocking and publishes the
|
|
319
|
+
// step output `drifted=<count>` for the dispatch step below. The check is nearly free here
|
|
320
|
+
// (devenv is already up).
|
|
321
|
+
return [` - name: ${step.name}`, ' id: managed-drift', ' run: smoo monorepo check --warn'];
|
|
328
322
|
case CiWorkflowStepKind.ManagedFilesDispatch:
|
|
329
323
|
// Dispatches the managed-files workflow, which maintains the persistent
|
|
330
|
-
// review PR. workflow_dispatch is exempt from
|
|
331
|
-
// recursion guard, so the default token suffices.
|
|
324
|
+
// review PR, from the default branch only. workflow_dispatch is exempt from
|
|
325
|
+
// GitHub's GITHUB_TOKEN recursion guard, so the default token suffices.
|
|
332
326
|
return [
|
|
333
327
|
` - name: ${step.name}`,
|
|
334
|
-
|
|
328
|
+
' if: >-',
|
|
329
|
+
" ${{ github.event_name == 'push' && github.ref == format('refs/heads/{0}',",
|
|
330
|
+
" github.event.repository.default_branch) && steps.managed-drift.outputs.drifted != '' &&",
|
|
331
|
+
" steps.managed-drift.outputs.drifted != '0' }}",
|
|
335
332
|
' run: smoo github-ci dispatch-workflow --workflow managed-files.yml --ref "$GITHUB_REF_NAME"',
|
|
336
333
|
];
|
|
337
334
|
case CiWorkflowStepKind.Deploy:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/managed-files/files.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,EAC7B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,kBAAkB,EAAmD,MAAM,kBAAkB,CAAC;AAI5G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAa7C,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,OAAO,CAAC;IACjC,0BAA0B,EAAE,OAAO,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB,EAAE,OAAO,CAAC;IACjC,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,CAAC,EAAE,YAAY,CAAC;IACrC,wBAAwB,CAAC,EAAE,YAAY,CAAC;IACxC,cAAc,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,yFAAyF;IACzF,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACzD,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,6BAA6B,CAAC;IAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,qFAAqF;IACrF,0BAA0B,EAAE,MAAM,EAAE,CAAC;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;IACrC,wFAAwF;IACxF,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,sFAAsF;IACtF,eAAe,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAChD,kGAAkG;IAClG,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD,uGAAuG;IACvG,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC;;;;OAIG;IACH,iBAAiB,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,sFAAsF;AACtF,eAAO,MAAM,gBAAgB;aAC3B,OAAO,EAAE,QAAQ;aACjB,GAAG,EAAE,aAAa;aAClB,IAAI,EAAE,2BAA2B;CACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"files.d.ts","sourceRoot":"","sources":["../../src/managed-files/files.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,aAAa,EACb,6BAA6B,EAC7B,uBAAuB,EACvB,wBAAwB,EACxB,iBAAiB,EACjB,6BAA6B,EAC7B,2BAA2B,EAC5B,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,KAAK,kBAAkB,EAAmD,MAAM,kBAAkB,CAAC;AAI5G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAa7C,MAAM,WAAW,kBAAkB;IACjC,kBAAkB,EAAE,OAAO,CAAC;IAC5B,uBAAuB,EAAE,OAAO,CAAC;IACjC,0BAA0B,EAAE,OAAO,CAAC;IACpC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,uBAAuB,EAAE,OAAO,CAAC;IACjC,8BAA8B,EAAE,OAAO,CAAC;IACxC,qBAAqB,CAAC,EAAE,YAAY,CAAC;IACrC,wBAAwB,CAAC,EAAE,YAAY,CAAC;IACxC,cAAc,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,yFAAyF;IACzF,WAAW,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC/B,gBAAgB,CAAC,EAAE,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;IACzD,eAAe,CAAC,EAAE,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACvD,cAAc,CAAC,EAAE,6BAA6B,CAAC;IAC/C,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,mBAAmB,EAAE,MAAM,EAAE,CAAC;IAC9B,qFAAqF;IACrF,0BAA0B,EAAE,MAAM,EAAE,CAAC;IACrC,0BAA0B,EAAE,MAAM,EAAE,CAAC;IACrC,wFAAwF;IACxF,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,sFAAsF;IACtF,eAAe,CAAC,EAAE,2BAA2B,EAAE,CAAC;IAChD,kGAAkG;IAClG,gBAAgB,CAAC,EAAE,6BAA6B,CAAC;IACjD,uGAAuG;IACvG,WAAW,CAAC,EAAE,wBAAwB,CAAC;IACvC;;;;OAIG;IACH,iBAAiB,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,sFAAsF;AACtF,eAAO,MAAM,gBAAgB;aAC3B,OAAO,EAAE,QAAQ;aACjB,GAAG,EAAE,aAAa;aAClB,IAAI,EAAE,2BAA2B;CACzB,CAAC;AA6JX,eAAO,MAAM,yBAAyB;;;GAAyE,CAAC;AAchH,qFAAqF;AACrF,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,EAAE,CAElF;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,EAAE,CAM7E;AAED,+GAA+G;AAC/G,wBAAgB,4BAA4B,CAC1C,MAAM,EAAE,aAAa,GAAG,kBAAkB,GAAG,6BAA6B,EAC1E,OAAO,EAAE,kBAAkB,GAC1B,MAAM,CAMR"}
|
|
@@ -46,6 +46,11 @@ const managedFiles = [
|
|
|
46
46
|
target: 'tooling/direnv/setup-environment.ts',
|
|
47
47
|
executable: true,
|
|
48
48
|
},
|
|
49
|
+
{
|
|
50
|
+
kind: 'raw',
|
|
51
|
+
source: 'tooling/direnv/developer-links.ts',
|
|
52
|
+
target: 'tooling/direnv/developer-links.ts',
|
|
53
|
+
},
|
|
49
54
|
{
|
|
50
55
|
kind: 'raw',
|
|
51
56
|
source: 'tooling/direnv/secret-references.ts',
|
|
@@ -62,6 +67,11 @@ const managedFiles = [
|
|
|
62
67
|
source: 'tooling/direnv/devenv.smoo.nix',
|
|
63
68
|
target: 'tooling/direnv/devenv.smoo.nix',
|
|
64
69
|
},
|
|
70
|
+
{
|
|
71
|
+
kind: 'raw',
|
|
72
|
+
source: 'tooling/direnv/shared-caches.sh',
|
|
73
|
+
target: 'tooling/direnv/shared-caches.sh',
|
|
74
|
+
},
|
|
65
75
|
{
|
|
66
76
|
kind: 'raw',
|
|
67
77
|
source: 'tooling/git-hooks/pre-commit.sh',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publish-workflow.d.ts","sourceRoot":"","sources":["../../src/managed-files/publish-workflow.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"publish-workflow.d.ts","sourceRoot":"","sources":["../../src/managed-files/publish-workflow.ts"],"names":[],"mappings":"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"}
|