Skip to content

fix(release): guard ancestry filtering of pending commits - #116

Merged
0xApotheosis merged 3 commits into
developfrom
fix/release-ancestry-preview
Oct 9, 2026
Merged

0xApotheosis merged 3 commits into
developfrom
fix/release-ancestry-preview

Conversation

@0xApotheosis

@0xApotheosis 0xApotheosis commented Oct 9, 2026 •

Copy link
Copy Markdown
Member

Description

Fixes regular release previews listing #113 again after it was released as v1.9.0 under a different commit SHA.

Uses ancestry filtering and skips merges that add no content, while retaining feature merges. Stops before creating a release if main is not an ancestor of develop, or if the merge-back includes earlier unreleased develop changes that filtering would hide.

Verification

  • Run bun test scripts/release-commits.test.ts to exercise duplicate release commits, feature merges, matching branches, diverged branches, and unreleased work preceding a merge-back.
  • Inspect the preview without creating a release: bun -e 'import { getRegularReleaseCommits } from "./scripts/release-commits"; console.log(await getRegularReleaseCommits())'.

Confirmed locally: with main at v1.9.0 and develop at #115, the preview lists only #114 and #115. The fixture tests retain feature merges and reject both unsafe histories.

Summary by CodeRabbit

  • Chores
    • Regular release summaries now list commits individually and more accurately reflect changes included in the release.
    • Release processing now stops with a clear error when it encounters a failure, rather than continuing as if successful.

@railway-app

railway-app Bot commented Oct 9, 2026

Copy link
Copy Markdown

🚅 Deployed to the website-frontend-pr-116 environment in website-frontend

1 service not affected by this PR
  • website-frontend

@coderabbitai

coderabbitai Bot commented Oct 9, 2026 •

Copy link
Copy Markdown
Contributor

Review in Change Stack →

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 0214428b-6a9f-4fe0-af1c-76a94954d70f
📥 Commits

Reviewing files that changed from the base of the PR and between 5313bfc and 344ae25.

📒 Files selected for processing (3)
  • scripts/release-commits.test.ts
  • scripts/release-commits.ts
  • scripts/release.ts
 ___________________________________________
< My mommy says I'm the best code reviewer. >
 -------------------------------------------
  \
   \   \
        \ /\
        ( )
      .( o ).
✨ Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@0xApotheosis
0xApotheosis merged commit eaada8e into develop Oct 9, 2026
1 check passed
@0xApotheosis
0xApotheosis deleted the fix/release-ancestry-preview branch October 9, 2026 01:08
@railway-app
railway-app Bot temporarily deployed to website-frontend / website-frontend-pr-116 October 9, 2026 01:08 Destroyed

This branch was successfully deployed

No deployments
website-frontend / website-frontend-pr-116 — b1159927 Deployed Oct 9, 2026 by railway-app[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant