Skip to content

merge queue: merged #12310: Fix lookup of header files in install-includes - #12576

Closed
mergify[bot] wants to merge 3 commits into
masterfrom
mergify/merge-queue/29ad3f99eb
Closed

merge queue: merged #12310: Fix lookup of header files in install-includes#12576
mergify[bot] wants to merge 3 commits into
masterfrom
mergify/merge-queue/29ad3f99eb

Conversation

@mergify

@mergify mergify Bot commented Nov 11, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Note

This is a merge queue draft opened by Mergify. Its pull request has merged, and nobody needs to act on it.
Mergify opened it for batch offbeat-painlevain-5vpwrl of the default queue, to test #12310 before it merged into master.

🎉 What landed

Mergify merged its pull request into master, then closed this draft:

  • #12310 Fix lookup of header files in install-includes (sheaf), as 22b6bf9

This draft's code was built in this order:

  1. master at 3c15ba7
  2. #12310, the pull request of this batch

Bisected from a failed batch:

Metadata for CI tooling, read by mergify ci 
---
all_scopes: false
checking_base_sha: 3c15ba73db6d66832ababa9ee8082150c3a3cebe
previous_check_retries: []
previous_failed_batches:
  - batch_pr_head_sha: 7d5e10e21f1e7032b31d2d2c8fc2230d4f710227
    batch_pr_number: 12575
    checked_pull_requests:
      - 12310
      - 12497
    draft_pr_head_sha: 7d5e10e21f1e7032b31d2d2c8fc2230d4f710227
    draft_pr_number: 12575
pull_requests:
  - number: 12310
    scopes: []
scopes: []
...
Required conditions of queue rule default for merge
  • #review-threads-unresolved = 0 [🛡 GitHub branch protection]
  • github-review-approved [🛡 GitHub branch protection]
  • 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

sheaf and others added 3 commits November 9, 2026 09:23
@sheaf
Remove packageRoot
f187a82
@sheaf @zlonast
Fix lookup of header files in install-includes
9de271e 
Header files named in `includes` and `install-includes` are now looked
up in the same set of directories everywhere, via the new
`Distribution.Simple.BuildPaths.includeSearchDirs`.

This fixes the following issues:

  - A header at the package root (without any `include-dirs`) would not
    be found when compiling C sources.

  - Generated header files for sub-libraries and foreign libraries would
    not be found (we looked under the component's build directory rather
    than the package's).

  - Absolute `include-dirs` entries were silently ignored when locating
    `install-includes` files (#11186).

Fixes #11186

Co-Authored-By: Ilya Baryshnikov <zlonast3@gmail.com>
@mergify @mergify-commit-signer
Merge of #12310
35624c7
@mergify mergify Bot mentioned this pull request Nov 11, 2026
Merged
5 tasks done
@mergify mergify Bot changed the title merge queue: checking #12310 on master (3c15ba7) merge queue: merged #12310: Fix lookup of header files in install-includes Nov 11, 2026
@mergify mergify Bot closed this Nov 11, 2026
@mergify
mergify Bot deleted the mergify/merge-queue/29ad3f99eb branch November 11, 2026 19:00
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

@sheaf