github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-07-15 22:54:03 -05:00
Code Issues 3.0k Packages Projects Releases 58 Wiki Activity

[PR #7640] [MERGED] fix cherrypicked commits not being respected and lint race in release note generation workflow #65275

New Issue
Closed
opened 2026-05-11 22:26:19 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-11 22:26:19 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/7640
Author: @matt-fidd
Created: 4/27/2026
Status: ✅ Merged
Merged: 4/27/2026
Merged by: @matt-fidd

Base: master ← Head: release-note-generation-2

📝 Commits (5)

📊 Changes

2 files changed (+45 additions, -12 deletions)

View changed files

📝 packages/ci-actions/bin/release-notes-generate.mjs (+39 -12)
➕ upcoming-release-notes/7640.md (+6 -0)

📄 Description

Description

If the release notes do not pass lint, the bots end up in an infinite loop. I've tweaked the templates so they should match but running lint doesn't hurt.

Also, my previous approach reset to the head of the branch to grab the deleted release notes back which obviously, in hindsight, ignores all cherry picked commits. Fixed by "undeleting" all of the release notes that were deleted in previous commits.

Related issue(s)

Testing

Checklist

  • Release notes added (see link above)
  • No obvious regressions in affected areas
  • Self-review has been performed - I understand what each change in the code does and why it is needed

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/7640 **Author:** [@matt-fidd](https://github.com/matt-fidd) **Created:** 4/27/2026 **Status:** ✅ Merged **Merged:** 4/27/2026 **Merged by:** [@matt-fidd](https://github.com/matt-fidd) **Base:** `master` ← **Head:** `release-note-generation-2` --- ### 📝 Commits (5) - [`95d7fde`](https://github.com/actualbudget/actual/commit/95d7fde964cb10c8f2781229a5bfffc970a02801) fix cherrypicked commits not being respected and lint race - [`b9a2343`](https://github.com/actualbudget/actual/commit/b9a2343a80ed6037ee89d812b230ae457f483c45) note - [`c133063`](https://github.com/actualbudget/actual/commit/c1330633367c9201d3a74818659be09564f9e68a) coderabbit suggestions - [`53ed011`](https://github.com/actualbudget/actual/commit/53ed011f74fbed6a97b1e4f466e3221789b1a5e7) fix lint - [`00b5867`](https://github.com/actualbudget/actual/commit/00b58679d156d1e95e606e72c4e1a8bb4fa77dfd) make double restore possibility safe ### 📊 Changes **2 files changed** (+45 additions, -12 deletions) <details> <summary>View changed files</summary> 📝 `packages/ci-actions/bin/release-notes-generate.mjs` (+39 -12) ➕ `upcoming-release-notes/7640.md` (+6 -0) </details> ### 📄 Description <!-- Thank you for submitting a pull request! Make sure to follow the instructions to write release notes for your PR — it should only take a minute or two: https://github.com/actualbudget/docs#writing-good-release-notes. Try running yarn generate:release-notes *before* pushing your PR for an interactive experience. --> ## Description <!-- What does this PR do? Why is it needed? Please give context on the "why?": why do we need this change? What problem is it solving for you?--> If the release notes do not pass lint, the bots end up in an infinite loop. I've tweaked the templates so they should match but running lint doesn't hurt. Also, my previous approach reset to the head of the branch to grab the deleted release notes back which obviously, in hindsight, ignores all cherry picked commits. Fixed by "undeleting" all of the release notes that were deleted in previous commits. ## Related issue(s) <!-- e.g. Fixes #123, Relates to #456 --> ## Testing <!-- What did you test? How can we reproduce the issue you are fixing or how can we test the feature you built? --> ## Checklist - [x] Release notes added (see link above) - [x] No obvious regressions in affected areas - [x] Self-review has been performed - I understand what each change in the code does and why it is needed <!--- actual-bot-sections ---> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-11 22:26:19 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
tech-support
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#65275
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?