Release/9.1 to maintenance-10.x - #12005
Open
sensei-hacker wants to merge 7 commits into
Open
sensei-hacker wants to merge 7 commits into
sensei-hacker wants to merge 7 commits into
Conversation
maintenance-9.x -> maintenance-10.x (now the compatible/current choice) maintenance-10.x -> maintenance-11.x (now the breaking/next-major choice) maintenance-11.x was just created off maintenance-10.x's tip, per the release process's "create the next major's branch at first RC" rule.
Merging to master means the change never ends up in any release, rather than implying that's an acceptable default.
…ion-release91 Update PR branch-suggestion workflow for maintenance-11.x
…ion-release91 docs: update pr-branch-suggestion README entry for 10.x/11.x cycle
Contributor
|
ⓘ Qodo reviews are paused because the subscription is no longer active. Ask your workspace admin to reactivate the subscription to resume reviews. Manage billing |
PR Summary by QodoAdvance branch guidance to 10.x/11.x and refresh README
AI Description
Diagram
High-Level Assessment
Files changed (3)
|
Code Review by Qodo
1. Master changes can miss every release
|
![qodo-free-for-open-source-projects[bot]](https://avatars.githubusercontent.com/in/1068000?s=60&v=4){kind=small}
| - **\`maintenance-11.x\`** - If your change introduces compatibility requirements between firmware and configurator that would break 10.x compatibility. This is for PRs which will be included in INAV 11.x | ||
|
|
||
| If \`master\` is the correct target for this change, no action is needed. | ||
| Merging to \`master\` would mean your change never ends up in any release. |
There was a problem hiding this comment.
1. Master changes can miss every release 🐞 Bug ≡ Correctness
The branch-suggestion comment now tells contributors that merging to master means their change never reaches a release. The documented release workflow merges the current maintenance branch into master and then propagates master into the next version branch, so contributors may incorrectly retarget valid changes away from the repository’s intended integration path.
Agent Prompt
## Issue description
The branch-suggestion comment claims that changes merged to `master` never reach a release, but the repository's documented release workflow explicitly propagates changes from `master` into the next maintenance branch. This can cause contributors to target the wrong branch.
## Fix Focus Areas
- .github/workflows/pr-branch-suggestion.yml[27-27]
- docs/development/Development.md[170-198]
## Recommended Fix
Replace the absolute statement with wording that explains the intended role of `master` and directs contributors to the appropriate maintenance branch when they want a change included in a specific release. Keep the guidance consistent with the documented `maintenance-9.x -> master -> maintenance-10.x` propagation flow.
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
| - **\`maintenance-10.x\`** - If your change is backward-compatible and won't create compatibility issues between INAV firmware and Configurator 10.x versions. This will allow your PR to be included in the next 10.x release. | ||
|
|
||
| - **\`maintenance-10.x\`** - If your change introduces compatibility requirements between firmware and configurator that would break 9.x compatibility. This is for PRs which will be included in INAV 10.x | ||
| - **\`maintenance-11.x\`** - If your change introduces compatibility requirements between firmware and configurator that would break 10.x compatibility. This is for PRs which will be included in INAV 11.x |
There was a problem hiding this comment.
2. Suggested 11.x changes lack nightly builds 🐞 Bug ☼ Reliability
The updated suggestion directs breaking changes to maintenance-11.x, but the nightly build workflow has no maintenance-11.x push trigger. Contributors following the new instruction can therefore merge changes to that branch without the repository’s nightly firmware build running for it.
Agent Prompt
## Issue description
The branch suggestion introduces `maintenance-11.x` as the destination for breaking changes, but the nightly build workflow does not run on pushes to that branch. This leaves the newly recommended release branch without nightly build coverage.
## Fix Focus Areas
- .github/workflows/pr-branch-suggestion.yml[25-25]
- .github/workflows/nightly-build.yml[5-13]
## Recommended Fix
Add `maintenance-11.x` to the nightly build workflow's branch trigger list, or update the branch suggestion to target only branches that are currently covered by the release validation workflows.
ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools
|
RAM / Flash usage vs. base commit
See RAM/flash optimization guide for techniques to reduce usage. |
|
Test firmware build ready — commit Download firmware for PR #12005 250 targets built. Find your board's
|
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.
No description provided.