Skip to content

Commit c4defe7

Browse files
fix(module-federation): align metro selectors and verifier checks
1 parent e36ff4a commit c4defe7

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

tools/scripts/ci-local.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ const jobs = [
184184
'nx',
185185
'run-many',
186186
'--targets=build',
187-
'--projects=tag:type:pkg,tag:type:metro',
187+
'--projects=tag:type:pkg',
188188
'--parallel=4',
189189
'--skip-nx-cache',
190190
],
@@ -204,7 +204,7 @@ const jobs = [
204204
'-t',
205205
'test',
206206
'--parallel=2',
207-
'--exclude=*,!tag:type:metro',
207+
'--exclude=*,!tag:npm:metro',
208208
],
209209
ctx,
210210
),
@@ -217,7 +217,7 @@ const jobs = [
217217
'nx',
218218
'run-many',
219219
'--targets=lint',
220-
'--projects=tag:type:metro',
220+
'--projects=tag:npm:metro',
221221
'--parallel=2',
222222
],
223223
ctx,

tools/scripts/verify-publint-workflow-coverage.mjs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ const MIN_EXPECTED_PACKAGE_COUNT = Number.parseInt(
2121
const VERIFY_STEP_NAME = 'Verify Publint Workflow Coverage';
2222
const METRO_EXCLUSION_PATTERN =
2323
/\[\[\s*"\$pkg"\s*!=\s*packages\/metro-\*\s*\]\]|\[\s*"\$pkg"\s*!=\s*"packages\/metro-\*"\s*\]/;
24+
const CI_LOCAL_BUILD_METRO_JOB_PATTERN = /name:\s*'build-metro'/;
2425

2526
const REQUIRED_PATTERNS = {
2627
buildAndTestLoop: [/for pkg in packages\/\*; do/, /npx publint "\$pkg"/],
@@ -109,7 +110,9 @@ function main() {
109110
? readWorkflow(BUILD_METRO_WORKFLOW, issues)
110111
: null;
111112
const ciLocalText = readText(CI_LOCAL_SCRIPT, issues);
112-
const ciLocalWorkflowStepMinCount = hasBuildMetroWorkflow ? 2 : 1;
113+
const hasCiLocalBuildMetroJob =
114+
CI_LOCAL_BUILD_METRO_JOB_PATTERN.test(ciLocalText);
115+
const ciLocalWorkflowStepMinCount = hasCiLocalBuildMetroJob ? 2 : 1;
113116

114117
const buildAndTestLoop = readRunCommand({
115118
workflow: buildAndTestWorkflow,
@@ -205,7 +208,7 @@ function main() {
205208
description: REQUIRED_PATTERNS.ciLocal.nonMetroPublintLoop.description,
206209
issues,
207210
});
208-
if (hasBuildMetroWorkflow) {
211+
if (hasCiLocalBuildMetroJob) {
209212
assertPatternCount({
210213
text: ciLocalText,
211214
pattern: REQUIRED_PATTERNS.ciLocal.metroPublintLoop.pattern,

0 commit comments

Comments
 (0)