Skip to content

fix(ci): drop rebase-reconciliation and backport noise from release notes - #1132

Merged
Deeds67 merged 1 commit into
mainfrom
fix/release-notes-drop-rebase-noise
Sep 24, 2026
Merged

Deeds67 merged 1 commit into
mainfrom
fix/release-notes-drop-rebase-noise

Conversation

@Deeds67

@Deeds67 Deeds67 commented Sep 23, 2026

Copy link
Copy Markdown
Collaborator

Summary

  • v5.7.0's published "Gallery changes" section had 193 bullets: only 8 were real fork-authored changes with our own PR number, the rest were rebase-reconciliation fixups pushed directly to the rolling branch (typed fix(...)/feat(...) same as real work, so the existing type-based split couldn't separate them) plus 12 upstream backport commits (5-digit Immich PR numbers) that the primary base_new/base_old path never filtered — only the fallback branch had that check.
  • Now requires a commit to carry our own PR number (1-4 digits) to count as a Gallery change. Verified against the real v5.6.0..v5.7.0 range: reproduces exactly the 8 entries manually published in the corrected v5.7.0 release notes.
  • v5.7.0's live release notes have already been hand-corrected to match; this fixes the generator for future releases.

Test plan

  • Ran the updated awk filter against real repo history (v5.6.0..origin/main) and confirmed it produces the same 6 headline + 2 "Other" entries now published on the v5.7.0 release.
  • Next real release run will exercise it end-to-end.

…otes

v5.7.0's "Gallery changes" section ran to 193 bullets because the
feat|fix|perf/other split classifies by conventional-commit type, and
rebase-reconciliation fixups pushed directly to the rolling branch are
typed the same way as real fork work. Upstream commits backported early
(keeping Immich's own PR number, 5+ digits) weren't filtered out of the
primary base_new/base_old path either - only the fallback branch did that.

Require a commit's own PR number (1-4 digits, ours) to count as a Gallery
change; verified against v5.6.0..v5.7.0 it reproduces the 8 genuine
entries manually published in the corrected v5.7.0 release notes.
@Deeds67 Deeds67 added the changelog:skip Skip changelog entry label Sep 24, 2026
@Deeds67
Deeds67 merged commit 9e0824c into main Sep 24, 2026
45 of 46 checks passed
Deeds67 added a commit that referenced this pull request Sep 24, 2026
…otes (#1132)

v5.7.0's "Gallery changes" section ran to 193 bullets because the
feat|fix|perf/other split classifies by conventional-commit type, and
rebase-reconciliation fixups pushed directly to the rolling branch are
typed the same way as real fork work. Upstream commits backported early
(keeping Immich's own PR number, 5+ digits) weren't filtered out of the
primary base_new/base_old path either - only the fallback branch did that.

Require a commit's own PR number (1-4 digits, ours) to count as a Gallery
change; verified against v5.6.0..v5.7.0 it reproduces the 8 genuine
entries manually published in the corrected v5.7.0 release notes.
Deeds67 added a commit that referenced this pull request Sep 24, 2026
…otes (#1132)

v5.7.0's "Gallery changes" section ran to 193 bullets because the
feat|fix|perf/other split classifies by conventional-commit type, and
rebase-reconciliation fixups pushed directly to the rolling branch are
typed the same way as real fork work. Upstream commits backported early
(keeping Immich's own PR number, 5+ digits) weren't filtered out of the
primary base_new/base_old path either - only the fallback branch did that.

Require a commit's own PR number (1-4 digits, ours) to count as a Gallery
change; verified against v5.6.0..v5.7.0 it reproduces the 8 genuine
entries manually published in the corrected v5.7.0 release notes.
Deeds67 added a commit that referenced this pull request Sep 27, 2026
…otes (#1132)

v5.7.0's "Gallery changes" section ran to 193 bullets because the
feat|fix|perf/other split classifies by conventional-commit type, and
rebase-reconciliation fixups pushed directly to the rolling branch are
typed the same way as real fork work. Upstream commits backported early
(keeping Immich's own PR number, 5+ digits) weren't filtered out of the
primary base_new/base_old path either - only the fallback branch did that.

Require a commit's own PR number (1-4 digits, ours) to count as a Gallery
change; verified against v5.6.0..v5.7.0 it reproduces the 8 genuine
entries manually published in the corrected v5.7.0 release notes.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog:skip Skip changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant