Skip to content

merge queue: checking master (39955a8) and #11996 together#12162

Closed
mergify[bot] wants to merge 9 commits into
masterfrom
mergify/merge-queue/099354782e
Closed

merge queue: checking master (39955a8) and #11996 together#12162
mergify[bot] wants to merge 9 commits into
masterfrom
mergify/merge-queue/099354782e

Conversation

@mergify

@mergify mergify Bot commented Jul 26, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🎉 This pull request has been checked successfully and will be merged soon. 🎉

Branch master (39955a8) and #11996 are queued together for merge.

This pull request has been created by Mergify to check the mergeability of #11996.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.

Required conditions of queue rule squash-merge for merge:

  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • github-review-approved [🛡 GitHub branch protection] (documentation)
  • any of [🛡 GitHub branch protection]:
    • check-success = Doctest Cabal
    • check-neutral = Doctest Cabal
    • check-skipped = Doctest Cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Meta checks
    • check-neutral = Meta checks
    • check-skipped = Meta checks
  • any of [🛡 GitHub branch protection]:
    • check-success = docs/readthedocs.org:cabal
    • check-neutral = docs/readthedocs.org:cabal
    • check-skipped = docs/readthedocs.org:cabal
  • any of [🛡 GitHub branch protection]:
    • check-success = Validate post job
    • check-neutral = Validate post job
    • check-skipped = Validate post job
  • any of [🛡 GitHub branch protection]:
    • check-success = fourmolu
    • check-neutral = fourmolu
    • check-skipped = fourmolu
  • any of [🛡 GitHub branch protection]:
    • check-success = hlint
    • check-neutral = hlint
    • check-skipped = hlint
  • any of [🛡 GitHub branch protection]:
    • check-success = Bootstrap post job
    • check-neutral = Bootstrap post job
    • check-skipped = Bootstrap post job
  • any of [🛡 GitHub branch protection]:
    • check-success = whitespace
    • check-neutral = whitespace
    • check-skipped = whitespace
  • any of [🛡 GitHub branch protection]:
    • check-success = Check sdist post job
    • check-neutral = Check sdist post job
    • check-skipped = Check sdist post job
  • any of [🛡 GitHub branch protection]:
    • check-success = Changelogs
    • check-neutral = Changelogs
    • check-skipped = Changelogs

Required conditions to stay in the queue:

---
checking_base_sha: 39955a8fcdd9f0072e6745f671512b8cddadfc3f
previous_check_retries: []
previous_failed_batches: []
pull_requests:
  - number: 11996
    scopes: []
scopes: []
...

wasimat404 and others added 9 commits June 20, 2026 21:12
@wasimat404
Add parse error location to unparsable environment file warning
674f469 
When a GHC environment file cannot be parsed, the warning now includes
the line, column, and reason from the underlying parser, instead of only
stating that the file is unparsable.

Fixes #11963

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Add PR reference to changelog entry
0cb8fba 
Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Use show instead of displayException for ParseError
3bad346 
Text.Parsec.Error.ParseError has no Exception instance on older GHCs,
so displayException does not type-check. Its Show instance already
renders the line, column, and reason.

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Strengthen environment file parse error test
893e077 
Assert on the full warning message (location, unexpected character, and
expected tokens) rather than only the line and column, addressing review
feedback on test coverage.

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Use golden output file for environment file parse error test
6960b2a 
Record the full warning output to cabal.out rather than asserting on a
substring, so changes to the message are visible in review.

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Revert to assertion-based environment file test
d25e9a1 
Golden output recording fails across the CI matrix for this test because
the install command's surrounding output is not reproducible. Assert on
the key parts of the warning instead.

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Use golden output file for environment file parse error test
267af01 
Record the install output to cabal.out per review feedback, so changes to
the warning are visible in review.

Signed-off-by: wasimat404 <huaweiwasim7@gmail.com>
@wasimat404
Merge branch 'master' into fix/11963-env-file-parse-error
ee9b6fb
@mergify
Merge of #11996
d7e23b7
@mergify mergify Bot mentioned this pull request Jul 26, 2026
Merged
@mergify mergify Bot closed this Jul 26, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/099354782e branch July 26, 2026 12:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@wasimat404