ci(gates): merge 단계 job 14개를 셋으로 합친다
merge 단계가 게이트마다 job 하나(행렬 14개)라서 PR마다 checkout, setup-node, `pnpm install`을 14번 하고 브라우저 설치를 2번 한다. Gitea runner는 소유자 기계 한 대다. 사례(Vite 등)는 설치를 job당 한 번으로 묶는다(design-docs repo-structure/03-ci.md 3.5절). 고른 방법(03-ci.md 7.3절 F1, 소유자 승인 2026-11-07): - job 종류 `gate-sequence`를 더한다. job 하나가 게이트 여럿을 차례로 돈다. 게이트마다 `FE-GATE-NNN / <이름>` 단계이고 `if: !cancelled()`라 앞 게이트가 실패해도 다음 게이트가 돈다(행렬의 fail-fast: false와 같다). - merge job 셋: `merge_static`(001·002·003·010·011·012, 소스를 읽고 빌드하는 검사), `merge_test`(004·005·006·007·013·020, 시험), `merge_browser`(008·009, 브라우저 설치). release 단계는 셋을 모두 기다린다. 게이트 id·명령·증거·승격 공식은 그대로다. - 증거 업로드는 job마다 하나(`merge-static-<run>` 등)다. 버린 것: 행렬을 두고 `pnpm install`만 캐시하는 방법. runner 한 대에서는 job 수만큼 checkout과 준비가 남는다. 게이트를 job 하나에 모두 넣는 방법은 브라우저 설치를 모든 게이트가 기다린다. 위험: 한 job 안의 게이트가 같은 작업 공간을 쓴다. 앞 게이트의 산출물이 뒤 게이트에 남는다. desktop의 merge 단계 실행(게이트를 한 checkout에서 차례로 도는 것)과 같은 조건이라 그 결과로 확인했다. 실제 Gitea runner의 `!cancelled()` 해석은 Actions를 켠 뒤 확인한다. 검증(desktop): check:ci, check:types, CI 시험 4파일 통과. 합치기 전후 merge 단계 게이트별 결과 비교는 PR 본문에 적는다. Refs: design-docs repo-structure/03-ci.md 3.5·7.3·7.4절, README.md 3.3절
This commit is contained in:
@@ -405,7 +405,7 @@ const jobSchema = z
|
||||
.object({
|
||||
id,
|
||||
displayName: workflowValue,
|
||||
kind: z.enum(["gate-matrix", "gate-single", "immutable", "provider", "promotion", "deployment"]),
|
||||
kind: z.enum(["gate-matrix", "gate-sequence", "gate-single", "immutable", "provider", "promotion", "deployment"]),
|
||||
needs: z.array(id).max(32),
|
||||
condition: z.enum(["always", "needs-success", "merge", "release", "production", "field", "documentation"]),
|
||||
timeoutMinutes: z.number().int().positive(),
|
||||
@@ -912,10 +912,16 @@ function validateContractSemantics(
|
||||
if (gateOwners.length > 1) issue(`multiply owned gate: ${gate.id} by ${gateOwners.join(", ")}`);
|
||||
}
|
||||
const expectedJobOwnership: Readonly<Record<string, readonly string[]>> = {
|
||||
// The merge stage runs as three jobs, one install each (design-docs
|
||||
// repo-structure/03-ci.md F1): checks that read the source and build it,
|
||||
// tests, and the gates that need browsers. Each runs its gates one after
|
||||
// another in this order; a failed gate does not skip the next.
|
||||
// 15-01. The bundle budget (FE-GATE-012) runs on every PR: a feature that
|
||||
// pushes initial JavaScript over budget fails before it merges, not at the
|
||||
// next tagged release.
|
||||
merge_gate: ["FE-GATE-001", "FE-GATE-002", "FE-GATE-003", "FE-GATE-004", "FE-GATE-005", "FE-GATE-006", "FE-GATE-007", "FE-GATE-008", "FE-GATE-009", "FE-GATE-010", "FE-GATE-011", "FE-GATE-012", "FE-GATE-013", "FE-GATE-020"],
|
||||
merge_static: ["FE-GATE-001", "FE-GATE-002", "FE-GATE-003", "FE-GATE-010", "FE-GATE-011", "FE-GATE-012"],
|
||||
merge_test: ["FE-GATE-004", "FE-GATE-005", "FE-GATE-006", "FE-GATE-007", "FE-GATE-013", "FE-GATE-020"],
|
||||
merge_browser: ["FE-GATE-008", "FE-GATE-009"],
|
||||
release_gate: ["FE-GATE-014", "FE-GATE-026", "FE-GATE-028"],
|
||||
immutable_build: ["FE-GATE-015", "FE-GATE-027"],
|
||||
vulnerability_provider: [],
|
||||
@@ -929,7 +935,7 @@ function validateContractSemantics(
|
||||
documentation_gate: ["FE-GATE-017"],
|
||||
};
|
||||
if (JSON.stringify(contract.jobs.map(({ id }) => id)) !== JSON.stringify(Object.keys(expectedJobOwnership))) {
|
||||
issue("job registry must contain the exact ten canonical jobs in semantic order");
|
||||
issue("job registry must contain the exact twelve canonical jobs in semantic order");
|
||||
}
|
||||
for (const [jobId, gateIds] of Object.entries(expectedJobOwnership)) {
|
||||
const job = contract.jobs.find(({ id }) => id === jobId);
|
||||
@@ -938,8 +944,10 @@ function validateContractSemantics(
|
||||
}
|
||||
}
|
||||
const expectedJobGraph: Readonly<Record<string, readonly [CiWorkflowJob["kind"], readonly string[], CiWorkflowJob["condition"]]>> = {
|
||||
merge_gate: ["gate-matrix", [], "merge"],
|
||||
release_gate: ["gate-matrix", ["merge_gate"], "release"],
|
||||
merge_static: ["gate-sequence", [], "merge"],
|
||||
merge_test: ["gate-sequence", [], "merge"],
|
||||
merge_browser: ["gate-sequence", [], "merge"],
|
||||
release_gate: ["gate-matrix", ["merge_static", "merge_test", "merge_browser"], "release"],
|
||||
immutable_build: ["immutable", ["release_gate"], "release"],
|
||||
vulnerability_provider: ["provider", ["immutable_build"], "always"],
|
||||
provenance_provider: ["provider", ["immutable_build"], "always"],
|
||||
@@ -956,7 +964,9 @@ function validateContractSemantics(
|
||||
}
|
||||
}
|
||||
const expectedStepKinds: Readonly<Record<string, readonly CiWorkflowStep["kind"][]>> = {
|
||||
merge_gate: ["checkout", "setup-node", "frozen-install", "browser-install", "run-gate", "upload"],
|
||||
merge_static: ["checkout", "setup-node", "frozen-install", "run-gate", "upload"],
|
||||
merge_test: ["checkout", "setup-node", "frozen-install", "run-gate", "upload"],
|
||||
merge_browser: ["checkout", "setup-node", "frozen-install", "browser-install", "run-gate", "upload"],
|
||||
release_gate: ["checkout", "setup-node", "frozen-install", "browser-install", "run-gate", "upload"],
|
||||
immutable_build: ["checkout", "setup-node", "frozen-install", "run-gate", "archive-candidate", "upload", "upload"],
|
||||
vulnerability_provider: ["checkout", "setup-node", "frozen-install", "download", "run-provider", "validate-provider-evidence", "upload"],
|
||||
@@ -974,7 +984,9 @@ function validateContractSemantics(
|
||||
}
|
||||
}
|
||||
const expectedEnvironmentBindings: Readonly<Record<string, readonly Readonly<{ name: string; value: string }> []>> = {
|
||||
merge_gate: [],
|
||||
merge_static: [],
|
||||
merge_test: [],
|
||||
merge_browser: [],
|
||||
release_gate: [],
|
||||
immutable_build: [
|
||||
// FE-GATE-027 admits the built artifact to a named environment, so both
|
||||
@@ -1361,6 +1373,7 @@ function validateJobStepKinds(
|
||||
): void {
|
||||
const allowed: Readonly<Record<z.infer<typeof jobSchema>["kind"], ReadonlySet<string>>> = {
|
||||
"gate-matrix": new Set(["checkout", "setup-node", "frozen-install", "browser-install", "download", "extract", "run-gate", "upload"]),
|
||||
"gate-sequence": new Set(["checkout", "setup-node", "frozen-install", "browser-install", "run-gate", "upload"]),
|
||||
"gate-single": new Set(["checkout", "setup-node", "frozen-install", "run-gate", "upload"]),
|
||||
immutable: new Set(["checkout", "setup-node", "frozen-install", "run-gate", "archive-candidate", "upload"]),
|
||||
provider: new Set(["checkout", "setup-node", "frozen-install", "download", "extract", "run-provider", "validate-provider-evidence", "upload"]),
|
||||
|
||||
@@ -231,7 +231,7 @@ function renderJob(
|
||||
}
|
||||
}
|
||||
lines.push(" steps:");
|
||||
for (const step of job.steps) lines.push(...renderStep(job, step, transfers));
|
||||
for (const step of job.steps) lines.push(...renderStep(job, step, transfers, index));
|
||||
return lines;
|
||||
}
|
||||
|
||||
@@ -257,6 +257,7 @@ function renderStep(
|
||||
job: CiWorkflowJob,
|
||||
step: CiWorkflowStep,
|
||||
transfers: ReadonlyMap<string, Readonly<{ name: string }>>,
|
||||
index: ReturnType<typeof indexCiGateContract>,
|
||||
): string[] {
|
||||
switch (step.kind) {
|
||||
case "checkout":
|
||||
@@ -294,6 +295,16 @@ function renderStep(
|
||||
return [" - name: Run blocking gate", " run: corepack pnpm ci:gate -- ${{ matrix.gate }}"];
|
||||
}
|
||||
if (job.gateIds.length === 0) throw new TypeError(`run-gate step lacks ownership: ${job.id}`);
|
||||
// F1 (design-docs repo-structure/03-ci.md). A job of several gates shares
|
||||
// one install; each gate is a step named by its id, and a failed gate
|
||||
// does not skip the ones after it, as the matrix entries did not.
|
||||
if (job.kind === "gate-sequence") {
|
||||
return job.gateIds.flatMap((gateId) => [
|
||||
` - name: ${yamlScalar(`${gateId} / ${index.gates.get(gateId)?.name ?? ""}`)}`,
|
||||
" if: ${{ !cancelled() }}",
|
||||
` run: corepack pnpm ci:gate -- ${gateId}`,
|
||||
]);
|
||||
}
|
||||
// 12-02: every gate the job owns runs, in order. Rendering only the first
|
||||
// left FE-GATE-027 (release admission) out of the workflow.
|
||||
return job.gateIds.flatMap((gateId) => [
|
||||
|
||||
@@ -8,7 +8,7 @@ export const ciContractReportSchema = z
|
||||
commandDefinitionCount: z.number().int().positive(),
|
||||
commandReferenceCount: z.number().int().positive(),
|
||||
artifactCount: z.number().int().positive(),
|
||||
jobCount: z.literal(10),
|
||||
jobCount: z.literal(12),
|
||||
workflowSha256: z.string().regex(/^[a-f0-9]{64}$/u),
|
||||
durationStatus: z.string().min(1),
|
||||
negativeFixtures: z.array(
|
||||
|
||||
@@ -17,7 +17,7 @@ import type { RemovalCheck } from "./removal-fixture.ts";
|
||||
*/
|
||||
const BROWSER =
|
||||
"needs Playwright browsers. FE-GATE-020 runs in a merge job without them " +
|
||||
"(merge_gate matrix browser: false). The generated routes in the browser " +
|
||||
"(merge_test installs none). The generated routes in the browser " +
|
||||
"gates are reviewed as 1103/12-01 and 12-03.";
|
||||
const DRILL =
|
||||
"a removal drill copies the repository again. The drill runs the generated " +
|
||||
|
||||
Reference in New Issue
Block a user