Skip to content

Self-document the doc makefile - #12497

Merged
mergify[bot] merged 2 commits into
haskell:masterfrom
cabalism:doc/doc-makefile
Nov 12, 2026
Merged

mergify[bot] merged 2 commits into
haskell:masterfrom
cabalism:doc/doc-makefile

Conversation

@philderbeast

@philderbeast philderbeast commented Oct 29, 2026 •

Copy link
Copy Markdown
Collaborator

A follow on from #10608 but for adding help to the doc/Makefile, fixing #10596.

I'll squash commits before applying the merge label if this pull request is approved.


  • Patches conform to the coding conventions.
  • Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).

@philderbeast
philderbeast force-pushed the doc/doc-makefile branch 2 times, most recently from 61f2145 to c7f3802 Compare November 4, 2026 13:10

@leana8959 leana8959 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I think these ? quantifiers are redundant, otherwise lgtm :)

Comment thread Makefile Resolved
Comment thread doc/Makefile Resolved
@philderbeast

Copy link
Copy Markdown
Collaborator Author

I think these ? quantifiers are redundant, otherwise lgtm :)

Thanks @leana8959. Both grep -E and awk use POSIX extended regular expressions, so the ? works like optional rather than non-greedy.

Note, I copied the regex from the main Makefile into doc/Makefile but there we have rules with digits so had to account for that. I felt it better to have the same regex in both files so copied those changes back.

cabal/Makefile

Lines 343 to 346 in aca9bd4

.PHONY: help
help: ## Show the commented targets.
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | \
sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'

@leana8959 leana8959 left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thank you :)

philderbeast and others added 2 commits November 9, 2026 08:43
Co-Authored-By: Plume <leana.jiang+git@icloud.com>
@philderbeast philderbeast added the merge me Tell Mergify Bot to merge label Nov 9, 2026
@mergify mergify Bot added ready and waiting Mergify is waiting out the cooldown period merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days queued labels Nov 9, 2026
@mergify

mergify Bot commented Nov 11, 2026 •

Copy link
Copy Markdown
Contributor

❌ Left the queue · Validate old ghcs 8.0.2 failed

3 h 32 min in the queue, 1 h 36 min of it CI.

So far

Not proven to be this pull request's failure. It failed in a batch with #12310, and was not tested alone.

Reason

The merge conditions cannot be satisfied due to failing checks

  • Validate post job

Failing checks:

To get back in the queue

  • If the failure comes from the pull requests it was tested with, or is a flake, comment @mergifyio queue to queue it again as it is.
  • If it is this pull request's, push a fix: the pull request is queued again once its queue conditions match.

Times in UTC · dashboard · how the merge queue works

@zlonast

zlonast commented Nov 12, 2026

Copy link
Copy Markdown
Collaborator

@Mergifyio queue

@mergify

mergify Bot commented Nov 12, 2026 •

Copy link
Copy Markdown
Contributor

✅ Merged into master as 9ebb809 at 06:12 UTC

Merged together with #12549. 2 h 14 min in the queue, 2 h 4 min of it CI.

So far

12 merge conditions met
  • #review-threads-unresolved = 0 · required by GitHub branch protection
  • github-review-approved · required by GitHub branch protection
  • any of · required by GitHub branch protection:
    • check-success = Doctest Cabal
    • check-neutral = Doctest Cabal
    • check-skipped = Doctest Cabal
  • any of · required by GitHub branch protection:
    • check-success = Meta checks
    • check-neutral = Meta checks
    • check-skipped = Meta checks
  • any of · required by GitHub branch protection:
    • check-success = docs/readthedocs.org:cabal
    • check-neutral = docs/readthedocs.org:cabal
    • check-skipped = docs/readthedocs.org:cabal
  • any of · required by GitHub branch protection:
    • check-success = Validate post job
    • check-neutral = Validate post job
    • check-skipped = Validate post job
  • any of · required by GitHub branch protection:
    • check-success = fourmolu
    • check-neutral = fourmolu
    • check-skipped = fourmolu
  • any of · required by GitHub branch protection:
    • check-success = hlint
    • check-neutral = hlint
    • check-skipped = hlint
  • any of · required by GitHub branch protection:
    • check-success = Bootstrap post job
    • check-neutral = Bootstrap post job
    • check-skipped = Bootstrap post job
  • any of · required by GitHub branch protection:
    • check-success = whitespace
    • check-neutral = whitespace
    • check-skipped = whitespace
  • any of · required by GitHub branch protection:
    • check-success = Check sdist post job
    • check-neutral = Check sdist post job
    • check-skipped = Check sdist post job
  • any of · required by GitHub branch protection:
    • check-success = Changelogs
    • check-neutral = Changelogs
    • check-skipped = Changelogs

Times in UTC · dashboard · how the merge queue works

@mergify mergify Bot added queued and removed dequeued labels Nov 12, 2026
@mergify
mergify Bot merged commit 9ebb809 into haskell:master Nov 12, 2026
90 checks passed
@mergify mergify Bot removed the queued label Nov 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI-assisted merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge ready and waiting Mergify is waiting out the cooldown period

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants