Skip to content

Conversation

@ffaf1
Copy link
Collaborator

@ffaf1 ffaf1 commented Dec 10, 2025

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

Forward port of #11306 #11328 #11334

Copy link
Collaborator

@ulysses4ever ulysses4ever left a comment

Choose a reason for hiding this comment

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

not sure why the checklist on the issue didn't have that point, sorry...

@ffaf1 ffaf1 added squash+merge me Tell Mergify Bot to squash-merge and removed attention: needs-review labels Dec 10, 2025
@ffaf1 ffaf1 mentioned this pull request Dec 10, 2025
2 tasks
@mergify mergify bot added the ready and waiting Mergify is waiting out the cooldown period label Dec 11, 2025
@ffaf1 ffaf1 force-pushed the forward-port-changelogs-3.16.1.0 branch from d0da62c to 4c0cc3c Compare December 12, 2025 16:23
@geekosaur
Copy link
Collaborator

That may have reset the timer. I'd've waited and let Mergify do it.

@ffaf1
Copy link
Collaborator Author

ffaf1 commented Dec 12, 2025

One deprecated runner (macOS) was failing.

@geekosaur
Copy link
Collaborator

geekosaur commented Dec 12, 2025

Yes, but build-and-release isn't marked as required for merge. Otherwise we'd've been stuck trying to get the final backports into 3.16, because the problem started around then.

@ffaf1
Copy link
Collaborator Author

ffaf1 commented Dec 12, 2025

I see. Then I will let @ulysses4ever decide if this needs a merge delay passed label.

@mergify mergify bot added merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days queued labels Dec 12, 2025
@mergify
Copy link
Contributor

mergify bot commented Dec 12, 2025

Merge Queue Status

✅ The pull request has been merged at 4c0cc3c

This pull request spent 10 minutes 3 seconds in the queue, with no time running CI.
The checks were run in-place.

Required conditions to merge
  • #approved-reviews-by >= 2 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #review-threads-unresolved = 0 [🛡 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

@mergify mergify bot merged commit 8656465 into haskell:master Dec 12, 2025
161 of 166 checks passed
@mergify mergify bot removed the queued label Dec 12, 2025
@ffaf1 ffaf1 deleted the forward-port-changelogs-3.16.1.0 branch December 12, 2025 18:47
Kleidukos pushed a commit to Kleidukos/cabal that referenced this pull request Jan 6, 2026
* changelogs for 3.16.1.0

* remove changelog fragments in 3.16.1.0

* changelog additions from late backports

* remove new changelog.d fragments

* Update release-notes/cabal-install-3.16.1.0.md

Co-authored-by: ffaf1 <[email protected]>

* Update release-notes/cabal-install-3.16.1.0.md

Co-authored-by: ffaf1 <[email protected]>

* Update release date

---------

Co-authored-by: brandon s allbery kf8nh <[email protected]>
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 priority: high 🔥 ready and waiting Mergify is waiting out the cooldown period release squash+merge me Tell Mergify Bot to squash-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants