-
Notifications
You must be signed in to change notification settings - Fork 691
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Make check
recognise main-is
in conditional branches
#9768
Conversation
I am wondering: does it makes sense to add a changelog? This patch fixes a bug of the reimplementation, and the reimplementation will land in the yet-to-be-released |
If the currently released version doesn't have the bug, the changelog about fixing it is not needed imo. |
`main-is` not picked up when inside a multibranch CondNode.
Goes hand in hand with with simplifyCondTree.
`cabal check` had a problem recognising fields in presence of multiple branches. This patch fixes the problem and does not meaningfully increases CI time of particularly taxing tests (like “duplicate flagged dependencies” from MemoryUsage).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
@mergify backport 3.12 |
✅ Backports have been created
|
* Add tests for #9742 `main-is` not picked up when inside a multibranch CondNode. * Fix comments * Add simplifyBranch to Distribution.Types.CondTree Goes hand in hand with with simplifyCondTree. * Make `check` deal correctly with multiple branches `cabal check` had a problem recognising fields in presence of multiple branches. This patch fixes the problem and does not meaningfully increases CI time of particularly taxing tests (like “duplicate flagged dependencies” from MemoryUsage). --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> (cherry picked from commit 74b1f21)
Make `check` recognise `main-is` in conditional branches (backport #9768)
* Add tests for haskell#9742 `main-is` not picked up when inside a multibranch CondNode. * Fix comments * Add simplifyBranch to Distribution.Types.CondTree Goes hand in hand with with simplifyCondTree. * Make `check` deal correctly with multiple branches `cabal check` had a problem recognising fields in presence of multiple branches. This patch fixes the problem and does not meaningfully increases CI time of particularly taxing tests (like “duplicate flagged dependencies” from MemoryUsage). --------- Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Closes #9742.
Include the following checklist in your PR: