@intentius/chant-lexicon-gitlab 0.124.28 → 0.124.30

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "1ed5bc65d94ac924936f6889561beb9ddb0fb8c074fab7ea1418610bfc69b4c3",
+    "manifest.json": "dbc7a70f16679b2f6a8dfd4fa01ceb6aec0750fcf5ba7ee41cedab3e1412cf39",
     "meta.json": "db082fbf90c5941c498b2bee0f106103449c1a4c257716ca2220f0dd490450b2",
     "types/index.d.ts": "a048a66ebe20da0cb5fc889054cac69044d9bf882e2c56b5c5bf113d1f3ba57c",
     "rules/artifact-no-expiry.ts": "0ca5bb972d4a542126e8a0229d43b55658394cb7dd9b9923b2c590bec1c2ad7d",
@@ -55,5 +55,5 @@
     "skills/chant-gitlab-migrate.md": "4853d04980560b379e5b0f7267dcb0a1e5d5879cb9e9931681ce76b2a5fe69d8",
     "skills/chant-gitlab-patterns.md": "6d9a44e9e8de4c3820be9d65381b0d2ede4cb3626aaaf0011e21838a9fbf556e"
   },
-  "composite": "c2db47f5cf95f955fc6e409a73ae1a740b48140ce0f29f174ae54b88a92f6f6a"
+  "composite": "c2a6b70ffa9865bf4f758fce5851cb9c01cf1887170b0a320e6d15f74fe1c1ff"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "gitlab",
-  "version": "0.124.28",
+  "version": "0.124.30",
   "chantVersion": ">=0.1.0",
   "namespace": "GitLab",
   "intrinsics": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-gitlab",
-  "version": "0.124.28",
+  "version": "0.124.30",
   "description": "GitLab CI lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -67,8 +67,8 @@
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.124.28",
-    "@intentius/chant-lexicon-github": "^0.124.28"
+    "@intentius/chant": "^0.124.30",
+    "@intentius/chant-lexicon-github": "^0.124.30"
   },
   "peerDependenciesMeta": {
     "@intentius/chant-lexicon-github": {

package/src/components/__fixtures__/pr-loop-build.gitlab.golden.yml

@@ -0,0 +1,55 @@
+workflow:
+  name: chant-pr-prod
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+
+stages:
+  - plan
+  - apply
+
+variables:
+  CHANT_ENV: prod
+  GIT_DEPTH: '0'
+
+plan:
+  stage: plan
+  image: node:22
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+  variables:
+    BASE_SHA: '$CI_MERGE_REQUEST_DIFF_BASE_SHA'
+    PR_NUMBER: '$CI_MERGE_REQUEST_IID'
+  script:
+    - command -v tofu >/dev/null 2>&1 || (curl -fsSL https://get.opentofu.org/install-opentofu.sh -o /tmp/install-opentofu.sh && sh /tmp/install-opentofu.sh --install-method standalone)
+    - chant build --env prod
+    - chant lint
+    - chant components pr-plan --base "$BASE_SHA" --pr "$PR_NUMBER" --env prod --gate pr-apply --output .chant/pr --forge gitlab
+  artifacts:
+    when: always
+    paths:
+      - .chant/pr
+
+apply:
+  stage: apply
+  image: node:22
+  resource_group: chant-apply-prod
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+  variables:
+    BASE_SHA: '$CI_COMMIT_BEFORE_SHA'
+  script:
+    - command -v tofu >/dev/null 2>&1 || (curl -fsSL https://get.opentofu.org/install-opentofu.sh -o /tmp/install-opentofu.sh && sh /tmp/install-opentofu.sh --install-method standalone)
+    - if [ -z "$BASE_SHA" ] || [ "$BASE_SHA" = "0000000000000000000000000000000000000000" ]; then BASE_SHA="${CI_MERGE_REQUEST_DIFF_BASE_SHA:-}"; if [ -z "$BASE_SHA" ]; then git fetch origin $CI_DEFAULT_BRANCH && BASE_SHA="$(git merge-base FETCH_HEAD "$CI_COMMIT_SHA")"; if [ "$BASE_SHA" = "$CI_COMMIT_SHA" ]; then BASE_SHA="$(git rev-parse "$CI_COMMIT_SHA^")"; fi; fi; fi; export BASE_SHA
+    - chant build --env prod
+    - chant lint
+    - chant components pr-apply --base "$BASE_SHA" --env prod --gate pr-apply --output .chant/pr --forge gitlab --require-review --resume .chant/pr-resume/pr-apply.json
+  cache:
+    key: chant-apply-prod-$CI_COMMIT_SHA
+    paths:
+      - .chant/pr-resume/pr-apply.json
+    when: always
+  artifacts:
+    when: always
+    paths:
+      - .chant/pr

package/src/components/generate-pipeline.ts

@@ -302,7 +302,7 @@ function prLoopGitlabPipeline(
   const onMerge = gitlabPushRule(loop.branch ? JSON.stringify(loop.branch) : "$CI_DEFAULT_BRANCH");
   // A member's jobs start in its directory, after the image's install lines.
   const enter = rooted ? [] : [`cd ${memberShellDir(member!)}`];
-  const script = (job: typeof plan): string[] => [...prLoopSetup(image), ...enter, ...beforeScript, ...(job.setup ?? []), job.command, ...extraScript];
+  const script = (job: typeof plan): string[] => [...prLoopSetup(image), ...enter, ...beforeScript, ...(job.setup ?? []), ...(job.build ?? []), job.command, ...extraScript];
   const stages = ["plan", "apply"];
   const doc: Record<string, unknown> = {
     // Included files merge their top-level keys, so a member's file carries

package/src/components/generate-pr-pipeline.test.ts

@@ -63,6 +63,16 @@ describe("the GitLab merge-request pipeline", () => {
     expect(doc.apply.artifacts).toEqual({ when: "always", paths: [".chant/pr"] });
   });
 
+  test("events and reportUrl stream the run's events into the report artifact and copy the reports out (#4007)", () => {
+    const loud = parseYAML(generateGitlabPipeline(ESTATE, { env: "prod", prLoop: { events: true, reportUrl: "$CHANT_REPORT_URL" } }).yaml) as { plan: Job; apply: Job };
+    for (const job of [loud.plan, loud.apply]) {
+      expect(job.script.at(-1)).toContain('--events-json --report-url "$CHANT_REPORT_URL"');
+      expect(job.variables.CHANT_RUN_EVENTS_DIR).toBe(".chant/pr/run-events");
+      expect(job.artifacts).toEqual({ when: "always", paths: [".chant/pr"] });
+    }
+    expect(result.yaml).not.toContain("--events-json");
+  });
+
   test("runs in an image with git and installs OpenTofu, unless the caller names an image", () => {
     expect(doc.plan.image).toBe("node:22");
     expect(doc.apply.script[0]).toBe(PR_LOOP_SETUP[0]);
@@ -125,3 +135,35 @@ describe("the merge-request pipeline's branch (#3765)", () => {
     expect(() => generateGitlabPipeline(ESTATE, { env: "prod", prLoop: { branch: "re$lease" } })).toThrow(/filters on branch "re\$lease"/);
   });
 });
+
+describe("the gitlab pull-request pipeline with build (#4088)", () => {
+  const result = generateGitlabPipeline(ESTATE, { env: "prod", prLoop: { build: true } });
+  const doc = parseYAML(result.yaml) as Record<string, any>;
+  const golden = join(import.meta.dirname, "__fixtures__", "pr-loop-build.gitlab.golden.yml");
+
+  test("matches its golden", () => {
+    if (process.env.UPDATE_GOLDEN) writeFileSync(golden, result.yaml);
+    expect(result.yaml).toBe(readFileSync(golden, "utf-8"));
+  });
+
+  test("builds, then lints, before pr-plan and pr-apply", () => {
+    const script = (job: string) => (doc[job] as { script: string[] }).script;
+    for (const job of ["plan", "apply"]) {
+      const lines = script(job);
+      const i = lines.findIndex((l) => l.startsWith("chant components pr-"));
+      expect(lines.slice(i - 2, i)).toEqual(["chant build --env prod", "chant lint"]);
+    }
+  });
+
+  test("buildCommand replaces the build line and turns the option on", () => {
+    const yaml = generateGitlabPipeline(ESTATE, { env: "prod", prLoop: { buildCommand: "npm run build" } }).yaml;
+    expect(yaml).toContain("npm run build");
+    expect(yaml).not.toContain("chant build --env");
+    expect(yaml).toContain("chant lint");
+  });
+
+  test("the default output carries neither line", () => {
+    const plain = generateGitlabPipeline(ESTATE, { env: "prod", prLoop: {} }).yaml;
+    expect(plain).not.toContain("chant lint");
+  });
+});