CI: stop validating GHC 7 (backport #9886)#9957
Merged
mergify[bot] merged 2 commits into3.12from May 1, 2024
Merged
Conversation
Contributor
Author
|
Cherry-pick of 29dc53c has failed: To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally |
2 tasks
Collaborator
|
This is bizarre. It looks for all the world like one hunk is being applied in reverse. |
geekosaur
force-pushed
the
mergify/bp/3.12/pr-9886
branch
from
41e033f to
a58d8a2
Compare
Collaborator
|
Starting to think GitHub has a poltergeist. Updated and rebased locally, pushed it up, GH insisted there was a new conflict afterward and wanted to revert the OS X CI fix. Oy. |
Member
|
Thank you for working on that. Note that it's not terribly urgent (it prevents a CI breakage once github stops providing old node versions, which can happen any time now). I brought it up, because I thought it's responsible for the conflicts with the main CI fix PR backport. |
Member
|
So, is this ready for merge? |
Member
|
@mergify rebase |
Contributor
Author
❌ Base branch update has failedDetailsGit reported the following error: |
Mikolaj
approved these changes
May 1, 2024
Member
Mikolaj
left a comment
Mikolaj
left a comment
There was a problem hiding this comment.
I haven't looked closely, but if it's just the backport with the conflicts fixed, then yes, I'd recommend merging it in.
Member
|
Let me squash so that rebase doesn't fail. |
Member
|
@mergify squash |
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
Mikolaj
force-pushed
the
mergify/bp/3.12/pr-9886
branch
from
7a511c2 to
280aaa8
Compare
Contributor
Author
✅ Pull request squashed successfully |
Member
|
@mergify rebase |
Contributor
Author
☑️ Nothing to doDetails
|
Member
|
Please kindly set the merge label once you are satisfied this is not borked. |
Member
|
I addressed this to @geekosaur or @ffaf1, since you take care of the 3.12 backports and we need another pair of eyes, given the convoluted history of some of these backports. |
geekosaur
approved these changes
May 1, 2024
mergify
bot
added
the
merge delay passed
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
4 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.
Changes:
--ignore-projectincabal install hackage-repo-toolThis is an automatic backport of pull request #9886 done by [Mergify](https://mergify.com).