@catladder/cli 5.3.0 → 5.3.2

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.
Files changed (33) hide show
  1. package/dist/apps/cli/src/release/changesetCheckJob.js +17 -10
  2. package/dist/apps/cli/src/release/changesetCheckJob.js.map +1 -1
  3. package/dist/bundles/catci/index.js +1 -1
  4. package/dist/bundles/catenv/index.js +42 -7
  5. package/dist/bundles/cli/index.js +42 -7
  6. package/dist/bundles/skills/catladder-deploys/SKILL.md +8 -1
  7. package/dist/bundles/skills/catladder-deploys/references/deploy-types.md +1 -1
  8. package/dist/bundles/skills/catladder-migrate-release-method/SKILL.md +4 -3
  9. package/dist/bundles/skills/catladder-releases/SKILL.md +12 -7
  10. package/dist/packages/pipeline/src/backends/gitlab/createGitlabJobs.js +7 -2
  11. package/dist/packages/pipeline/src/backends/gitlab/createGitlabJobs.js.map +1 -1
  12. package/dist/packages/pipeline/src/backends/gitlab/gitlabReleaseJobs.js +5 -3
  13. package/dist/packages/pipeline/src/backends/gitlab/gitlabReleaseJobs.js.map +1 -1
  14. package/dist/packages/pipeline/src/backends/types.d.ts +6 -2
  15. package/dist/packages/pipeline/src/customImages/hash.d.ts +4 -0
  16. package/dist/packages/pipeline/src/customImages/hash.js +3 -0
  17. package/dist/packages/pipeline/src/customImages/hash.js.map +1 -1
  18. package/dist/packages/pipeline/src/customImages/jobImagesPlan.d.ts +2 -1
  19. package/dist/packages/pipeline/src/customImages/jobImagesPlan.js +21 -1
  20. package/dist/packages/pipeline/src/customImages/jobImagesPlan.js.map +1 -1
  21. package/dist/packages/pipeline/src/pipeline/generatePipelineFiles.js +1 -1
  22. package/dist/packages/pipeline/src/pipeline/generatePipelineFiles.js.map +1 -1
  23. package/dist/packages/pipeline/src/utils/writeFiles.d.ts +2 -1
  24. package/dist/packages/pipeline/src/utils/writeFiles.js +5 -0
  25. package/dist/packages/pipeline/src/utils/writeFiles.js.map +1 -1
  26. package/dist/skills/catladder-deploys/SKILL.md +8 -1
  27. package/dist/skills/catladder-deploys/references/deploy-types.md +1 -1
  28. package/dist/skills/catladder-migrate-release-method/SKILL.md +4 -3
  29. package/dist/skills/catladder-releases/SKILL.md +12 -7
  30. package/dist/tsconfig.tsbuildinfo +1 -1
  31. package/package.json +1 -1
  32. package/src/release/__tests__/changesetCheckJob.test.ts +68 -0
  33. package/src/release/changesetCheckJob.ts +18 -10
@@ -7,8 +7,9 @@ exports.changesetCheckJob = exports.CHANGESET_REPORT_FILE = void 0;
7
7
  * reports which changesets the merge request adds, what is pending and
8
8
  * what version merging would release. The report goes to the job log,
9
9
  * to `changeset-report.md` (exposed as an artifact on gitlab) and to a
10
- * sticky MR/PR comment where a token allows it. Exits 1 (the job runs
11
- * with allow_failure) when the merge request adds no changeset.
10
+ * sticky MR/PR comment where a token allows it. Always exits 0: a
11
+ * missing changeset is a warning carried by the report, not a job
12
+ * failure (see the end of {@link changesetCheckJob}).
12
13
  */
13
14
  const fs_1 = require("fs");
14
15
  const promises_1 = require("fs/promises");
@@ -169,19 +170,25 @@ const changesetCheckJob = async () => {
169
170
  return;
170
171
  }
171
172
  if (!result.addsChangeset) {
173
+ // the job stays green on both platforms — the report, the log and
174
+ // the sticky comment carry the "no changeset" warning instead:
175
+ // - github has no "warning" job state: exiting non-zero would show
176
+ // the job as failed (a red ❌ and "exit code 1"), which reads
177
+ // like something broke.
178
+ // - gitlab only resolves the exposed artifact (the MR widget's
179
+ // "changeset report" link) of a SUCCESSFUL job: for a failed
180
+ // allow_failure job `exposed_artifacts.json` answers 204 forever
181
+ // and the widget spins on "Loading artifacts" — exactly on the
182
+ // MRs that need the report.
172
183
  if (onGithub()) {
173
- // github has no "warning" job state: exiting non-zero would show
174
- // the job as failed (a red ❌ and "exit code 1"), which reads like
175
- // something broke. A warning annotation plus the step summary and
176
- // the sticky PR comment carry the signal instead.
177
184
  console.log("::warning title=No changeset::this pull request adds no changeset — " +
178
185
  "if the change is user-facing, add one so it appears in the next release's changelog");
179
186
  (0, stepSummary_1.appendStepSummary)(result.markdown.replace(`${changesetCheck_1.CHANGESET_CHECK_MARKER}\n`, ""));
180
- return;
181
187
  }
182
- // gitlab: exit 1 turns the (allow_failure) job yellow so reviewers
183
- // notice
184
- process.exitCode = 1;
188
+ else {
189
+ console.log("⚠️ this merge request adds no changeset — if the change is user-facing, " +
190
+ "add one so it appears in the next release's changelog (see the changeset report)");
191
+ }
185
192
  }
186
193
  };
187
194
  exports.changesetCheckJob = changesetCheckJob;
@@ -1 +1 @@
1
- {"version":3,"file":"changesetCheckJob.js","sourceRoot":"","sources":["../../../../../src/release/changesetCheckJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"changesetCheckJob.js","sourceRoot":"","sources":["../../../../../src/release/changesetCheckJob.ts"],"names":[],"mappings":"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"}