Skip to content
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

Merged
merged 5 commits into from
Mar 9, 2024

Conversation

ffaf1
Copy link
Collaborator

@ffaf1 ffaf1 commented Mar 2, 2024

Closes #9742.

Include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • Manual QA notes have been included.
  • Tests have been added. (Ask for help if you don’t know how to write them! Ask for an exemption if tests are too complex for too little coverage!)

@ffaf1
Copy link
Collaborator Author

ffaf1 commented Mar 2, 2024

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 3.12. A changelog would only add noise, am I wrong?

@ffaf1 ffaf1 marked this pull request as ready for review March 2, 2024 19:53
@ulysses4ever
Copy link
Collaborator

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).
Copy link
Collaborator

@alt-romes alt-romes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ffaf1 ffaf1 added the squash+merge me Tell Mergify Bot to squash-merge label Mar 6, 2024
@ffaf1
Copy link
Collaborator Author

ffaf1 commented Mar 7, 2024

@mergify backport 3.12

Copy link
Contributor

mergify bot commented Mar 7, 2024

backport 3.12

✅ Backports have been created

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Mar 9, 2024
@mergify mergify bot merged commit 74b1f21 into haskell:master Mar 9, 2024
53 checks passed
@ffaf1 ffaf1 deleted the no-main-is branch March 9, 2024 16:34
mergify bot pushed a commit that referenced this pull request Mar 9, 2024
* 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)
mergify bot added a commit that referenced this pull request Mar 11, 2024
Make `check` recognise `main-is` in conditional branches (backport #9768)
erikd pushed a commit to erikd/cabal that referenced this pull request Apr 22, 2024
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Regression on master: main-is not picked up from conditional
6 participants