[JUM-889][Fix] Promote unattended release branch-gate fixes to main - #524
Merged
Merged
Conversation
App-release hit STALE_DATA when chore/release-v0.2.15 lagged main. ensureBranchAtSha now force-updates mismatched tips before commit. Co-authored-by: Cursor <cursoragent@cursor.com>
CircleCI branch-push sets QUALITY_GATE_TARGET to CIRCLE_BRANCH, so the generated-automation check compared the head to itself and saw an empty diff (job 2158 / PR #522). Co-authored-by: Cursor <cursoragent@cursor.com>
## Summary - `ensureBranchAtSha` force-updates an existing automation branch when its tip differs from the intended SHA (app-release run 36246791005: `STALE_DATA` on `chore/release-v0.2.15` vs main `23b897e4`). - Hardens changelog-sync race catch for GraphQL `STALE_DATA` wording. ## Problem Statement - Related issue(s): JUM-889 - Related PR(s): #520 ## Project Tracking (Required) - Linear Project: `Jumentix` (`https://linear.app/jumentix`) - Focused epic link: https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e - Epic milestone: First tagged release published — 2026-10-27 - Primary task nature: fix - Epic-delegated agent ID: cursor - Child task issue link: https://linear.app/jumentix/issue/JUM-889/governance-epic-record-first-real-tagreleasepublish-proven-end-to-end - Project Update: https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e/activity#project-update-ea1f9f87 - Linear Project link(s): https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e - Linear Issue link(s): https://linear.app/jumentix/issue/JUM-889/governance-epic-record-first-real-tagreleasepublish-proven-end-to-end - Linear Issue ID list (comma separated): JUM-889 - Item status at PR creation: fixing stale release-branch tip for unattended app-release - Target cycle (`Start date` -> `End date`): 2026-09-25 -> 2026-10-27 - Priority group for this PR (`P0` / `P1` / `P2`): P0 - [x] This PR contains tasks from only one priority group. ## Branch Promotion Path (Required) - Source branch: `codex/fix/JUM-889-release-branch-force-reset` - Target branch: `dev` - [x] The leading `JUM-XXXX` matches the single Linear Issue declared above. - [x] This task PR targets `dev`. - [ ] If this PR targets `main`, it is a release promotion sourced from `dev`, references the task PRs/issues already merged into `dev`, and introduces no unreviewed changes. - [x] This PR is not a direct task/topic branch promotion to `main`. ## Bidirectional Traceability (Required) - [x] PR description includes mapping of task -> commit(s). - Task -> commit(s) mapping: - `JUM-889`: `5148a101` fix(release): force-reset stale chore/release branch tips ## Scope of Change ### Domain / Business Rules - None ### Application / Use Cases - None ### Adapters / Infrastructure - `ci-cd/create-app-release-tag.js` — force-reset mismatched automation branch tips - `ci-cd/test/release-tagging.test.ts` — unit coverage for create / match / force paths ### API / Contracts (OpenAPI, DTOs, handlers, controllers) - None ## Detailed Technical Changes 1. Existing `chore/release-v*` tips left from failed bumps caused `createCommitOnBranch` STALE_DATA. 2. `ensureBranchAtSha` now PATCHes with `force=true` when tip ≠ target SHA. ## Test plan - [x] `jest ci-cd/test/release-tagging.test.ts` (15 tests) green locally - [x] pre-commit `ci:gate:task` green - [ ] CCI required checks on this PR - [ ] After promote to main: app-release unattended for next releasable tip Made with [Cursor](https://cursor.com)
Bugbot couldn't run - usage limit reachedBugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit. A user or team admin can review and increase usage limits in the Cursor dashboard. (requestId: serverGenReqId_47ad8c85-b85d-40d0-b6b8-ea20365a1b1c) |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #524 +/- ##
=======================================
Coverage 98.12% 98.12%
=======================================
Files 477 477
Lines 15224 15224
Branches 2051 2051
=======================================
Hits 14938 14938
Misses 220 220
Partials 66 66
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
8 tasks
web2solutions
added a commit
that referenced
this pull request
Sep 26, 2026
## Summary - Fast-forward `dev` to `main` tip after unattended `v0.2.15` release (#525), GitHub Release, and changelog sync (#527). ## Problem Statement - Related issue(s): JUM-889 - Related PR(s): #525, #527 ## Project Tracking (Required) - Linear Project: `Jumentix` (`https://linear.app/jumentix`) - Focused epic link: https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e - Epic milestone: First tagged release published — 2026-10-27 - Primary task nature: chore - Epic-delegated agent ID: cursor - Child task issue link: https://linear.app/jumentix/issue/JUM-889/governance-epic-record-first-real-tagreleasepublish-proven-end-to-end - Project Update: https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e/activity#project-update-be9fb69b - Linear Project link(s): https://linear.app/jumentix/project/epicrelease-git-tags-drive-changelog-github-releases-and-npm-publish-1488546fc45e - Linear Issue link(s): https://linear.app/jumentix/issue/JUM-889/governance-epic-record-first-real-tagreleasepublish-proven-end-to-end - Linear Issue ID list (comma separated): JUM-889 - Item status at PR creation: syncing v0.2.15 ancestry into dev - Target cycle (`Start date` -> `End date`): 2026-09-25 -> 2026-10-27 - Priority group for this PR (`P0` / `P1` / `P2`): P1 - [x] This PR contains tasks from only one priority group. ## Branch Promotion Path (Required) - Source branch: `main` - Target branch: `dev` - [x] The leading `JUM-XXXX` matches the single Linear Issue declared above. - [x] This task PR targets `dev`. - [ ] If this PR targets `main`, it is a release promotion sourced from `dev`, references the task PRs/issues already merged into `dev`, and introduces no unreviewed changes. - [x] This PR is not a direct task/topic branch promotion to `main`. ## Bidirectional Traceability (Required) - [x] PR description includes mapping of task -> commit(s). - Task -> commit(s) mapping: - `JUM-889`: `1122076d` (#525), `5a177a63` (#527), `5f7169be` (#524) ## Scope of Change ### Domain / Business Rules - None ### Application / Use Cases - None ### Adapters / Infrastructure - Branch reconciliation only: `dev` ← `main` (`v0.2.15`) ### API / Contracts (OpenAPI, DTOs, handlers, controllers) - None ## Detailed Technical Changes 1. `dev` lagged `main` by 3 commits after release + changelog. ## Test plan - [x] app-release run 36250021449 **success**; tag `v0.2.15`; Release published; dry-run `noop`/`no-releasable-commits` - [ ] Required checks on this reconcile PR Made with [Cursor](https://cursor.com)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
dev→mainafter [JUM-889][Fix] Force-reset stale chore/release branch tips #523: force-reset stalechore/release-*tips + force generated-automation diffs againstmainon CircleCI branch-push (empty-diff / STALE_DATA blockers for unattendedv0.2.15).Problem Statement
Project Tracking (Required)
Jumentix(https://linear.app/jumentix)Start date->End date): 2026-09-25 -> 2026-10-27P0/P1/P2): P0Branch Promotion Path (Required)
devmainJUM-XXXXmatches the single Linear Issue declared above.dev.main, it is a release promotion sourced fromdev, references the task PRs/issues already merged intodev, and introduces no unreviewed changes.main.Bidirectional Traceability (Required)
JUM-889:5148a101,2254de8c(via [JUM-889][Fix] Force-reset stale chore/release branch tips #523)Scope of Change
Domain / Business Rules
Application / Use Cases
Adapters / Infrastructure
ci-cd/create-app-release-tag.js,ci-cd/check-generated-automation-pr.js(already ondevvia [JUM-889][Fix] Force-reset stale chore/release branch tips #523)API / Contracts (OpenAPI, DTOs, handlers, controllers)
Detailed Technical Changes
chore/release-v*branch-gate empty-diff / stale tip failures.Test plan
v0.2.15/ merge chore(release): v0.2.15 #522Made with Cursor