Merged
Conversation
ffaf1
added
attention: needs-review
attention: needs-backport in the future
2 tasks
geekosaur
approved these changes
Apr 23, 2024
ffaf1
added
squash+merge me
Mikolaj
approved these changes
Apr 23, 2024
Member
Mikolaj
left a comment
Mikolaj
left a comment
There was a problem hiding this comment.
Great job editing such a tangled stuff!
ffaf1
added a commit
to ffaf1/cabal
that referenced
this pull request
Apr 23, 2024
* Incorporate Brandon’s suggestions See haskell#9920. * Incorporate Artem’s suggestions See haskell#9920. * Do not repeat yourself
Mikolaj
pushed a commit
to ffaf1/cabal
that referenced
this pull request
Apr 25, 2024
* Incorporate Brandon’s suggestions See haskell#9920. * Incorporate Artem’s suggestions See haskell#9920. * Do not repeat yourself
mergify
bot
added
the
merge delay passed
mergify bot
pushed a commit
that referenced
this pull request
Apr 25, 2024
* Add release notes for Cabal 3.12 Forwardport of #9785, #9908 Add changelog/release notes for Cabal 3.12 (#9785) - generated with git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog - deduped - stored WIP “release notes” file for future `cabal-install` release 3.12 changelogs updated (#9908) * Update changelog for 3.12 (and for future WIP 3.12.1.0 cabal-install) * Remove changelog.d files * 3.12 changelog fixup (#9922) * Incorporate Brandon’s suggestions See #9920. * Incorporate Artem’s suggestions See #9920. * Do not repeat yourself * Fix whitespace * Fix release notes grammar See #9920.
geekosaur
pushed a commit
that referenced
this pull request
Apr 29, 2024
fendor
pushed a commit
to fendor/cabal
that referenced
this pull request
Apr 30, 2024
* Add release notes for Cabal 3.12 Forwardport of haskell#9785, haskell#9908 Add changelog/release notes for Cabal 3.12 (haskell#9785) - generated with git log --pretty=oneline --no-color cabal-install-v3.10.1.0..HEAD > 3.12.prlog - deduped - stored WIP “release notes” file for future `cabal-install` release 3.12 changelogs updated (haskell#9908) * Update changelog for 3.12 (and for future WIP 3.12.1.0 cabal-install) * Remove changelog.d files * 3.12 changelog fixup (haskell#9922) * Incorporate Brandon’s suggestions See haskell#9920. * Incorporate Artem’s suggestions See haskell#9920. * Do not repeat yourself * Fix whitespace * Fix release notes grammar See haskell#9920.
Mikolaj
added a commit
that referenced
this pull request
May 1, 2024
3.12 changelog fixup (#9922) * Incorporate Brandon’s suggestions See #9920. * Incorporate Artem’s suggestions See #9920. * Do not repeat yourself * Fix release notes grammar (#9924) * Fix release notes grammar See #9920. * Fix whitespace * Support GHC 9.12 (cherry picked from commit da6bdef) * Fix changelog/readme (backport #9935) (#9936) * Fix changelog/readme (cherry picked from commit ea0f464) * Remove previous release date --------- Co-authored-by: Francesco Ariis <[email protected]> * Tell zlib not to use pkg-config in GitLab CI. (cherry picked from commit 62c74fe) * Revert "Mark ForeignLibs test as broken with ghc-8.4.4" This reverts commit a90d44f. (cherry picked from commit d0a690b) * CI: drop validation of GHC 7 Changes: - bump GHC_FOR_RELEASE to 9.4.8 - bump action versions - uniform quoting style - satisfy actionlint - fix order: setup Haskell before cache restore (uses setup.haskell-outputs) - use `--ignore-project` in `cabal install hackage-repo-tool` - use GHC_FOR_RELEASE also in validate-old-ghcs - closes #8858: deleted comment - closes #9858 by dropping container and using ghcup to setup ghcs GHCs that do not install on ubuntu-22.04 with GHCup are dropped, meaning we only keep GHC 8.0.2 and up. (cherry picked from commit 29dc53c) # Conflicts: # .github/workflows/validate.yml * fix validate.yml conflicts How is this backport conflicting with _itself_? * copy an import list from #9551 because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using. * CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956) * CI: force MacOS jobs to use Intel runners (`macos-13`) GitHub just switched macos-latest to the ARM chips (now alisasing `macos-14`), and it brings a bunch of problems. - First of all, GHC's 8.8 and 8.6 don't exist there. - ghcup and llvm are unavailable For the time being, lets stay on the previous version of the runner. (cherry picked from commit d36e0d0) * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead (cherry picked from commit 082d952) * fixup! more compat with new macos runners (cherry picked from commit 326a1f6) * !fixup resolve conflicts * copy an import list from #9551 because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using. --------- Co-authored-by: Artem Pelenitsyn <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]> * Merge branch '3.12' into mergify/bp/3.12/pr-9886 * Update validate.yml github nicely decided to ~revert~ the OS X validate fix when I rebased on top of it. * make validate.yml consistent with master
mergify bot
added a commit
that referenced
this pull request
May 1, 2024
3.12 changelog fixup (#9922) * Incorporate Brandon’s suggestions See #9920. * Incorporate Artem’s suggestions See #9920. * Do not repeat yourself * Fix release notes grammar (#9924) * Fix release notes grammar See #9920. * Fix whitespace * Support GHC 9.12 (cherry picked from commit da6bdef) * Fix changelog/readme (backport #9935) (#9936) * Fix changelog/readme (cherry picked from commit ea0f464) * Remove previous release date --------- Co-authored-by: Francesco Ariis <[email protected]> * Tell zlib not to use pkg-config in GitLab CI. (cherry picked from commit 62c74fe) * Revert "Mark ForeignLibs test as broken with ghc-8.4.4" This reverts commit a90d44f. (cherry picked from commit d0a690b) * CI: drop validation of GHC 7 Changes: - bump GHC_FOR_RELEASE to 9.4.8 - bump action versions - uniform quoting style - satisfy actionlint - fix order: setup Haskell before cache restore (uses setup.haskell-outputs) - use `--ignore-project` in `cabal install hackage-repo-tool` - use GHC_FOR_RELEASE also in validate-old-ghcs - closes #8858: deleted comment - closes #9858 by dropping container and using ghcup to setup ghcs GHCs that do not install on ubuntu-22.04 with GHCup are dropped, meaning we only keep GHC 8.0.2 and up. (cherry picked from commit 29dc53c) # Conflicts: # .github/workflows/validate.yml * fix validate.yml conflicts How is this backport conflicting with _itself_? * copy an import list from #9551 because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using. * CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (#9956) * CI: force MacOS jobs to use Intel runners (`macos-13`) GitHub just switched macos-latest to the ARM chips (now alisasing `macos-14`), and it brings a bunch of problems. - First of all, GHC's 8.8 and 8.6 don't exist there. - ghcup and llvm are unavailable For the time being, lets stay on the previous version of the runner. (cherry picked from commit d36e0d0) * CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-action/setup instead (cherry picked from commit 082d952) * fixup! more compat with new macos runners (cherry picked from commit 326a1f6) * !fixup resolve conflicts * copy an import list from #9551 because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using. --------- Co-authored-by: Artem Pelenitsyn <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]> * Merge branch '3.12' into mergify/bp/3.12/pr-9886 * Update validate.yml github nicely decided to ~revert~ the OS X validate fix when I rebased on top of it. * make validate.yml consistent with master Co-authored-by: Mikolaj <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
As per @geekosaur and @ulysses4ever review.
Include the following checklist in your PR:
Is this a PR that fixes CI? If so, it will need to be backported to older cabal release branches (ask maintainers for directions).