Skip to content

CI: stop validating GHC 7 (backport #9886) #9957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

Changes:


This is an automatic backport of pull request #9886 done by [Mergify](https://mergify.com).

Copy link
Contributor Author

mergify bot commented Apr 29, 2024

Cherry-pick of 29dc53c has failed:

On branch mergify/bp/3.12/pr-9886
Your branch is ahead of 'origin/3.12' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 29dc53c33.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/validate.yml

no changes added to commit (use "git add" and/or "git commit -a")

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

@geekosaur
Copy link
Collaborator

This is bizarre. It looks for all the world like one hunk is being applied in reverse.

@geekosaur geekosaur force-pushed the mergify/bp/3.12/pr-9886 branch from 41e033f to a58d8a2 Compare April 29, 2024 23:01
@geekosaur
Copy link
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.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 30, 2024

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.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

So, is this ready for merge?

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

@mergify rebase

Copy link
Contributor Author

mergify bot commented May 1, 2024

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/12)
Auto-merging release-notes/Cabal-3.12.0.0.md
Auto-merging release-notes/WIP-cabal-install-3.12.x.0.md
CONFLICT (content): Merge conflict in release-notes/WIP-cabal-install-3.12.x.0.md
error: could not apply 271ae8fe5... 3.12 changelog fixup (#9922)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 271ae8fe5... 3.12 changelog fixup (#9922)

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

I haven't looked closely, but if it's just the backport with the conflicts fixed, then yes, I'd recommend merging it in.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

Let me squash so that rebase doesn't fail.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

@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 Mikolaj force-pushed the mergify/bp/3.12/pr-9886 branch from 7a511c2 to 280aaa8 Compare May 1, 2024 10:02
Copy link
Contributor Author

mergify bot commented May 1, 2024

squash

✅ Pull request squashed successfully

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

@mergify rebase

Copy link
Contributor Author

mergify bot commented May 1, 2024

rebase

☑️ Nothing to do

  • any of:
    • #commits-behind>0 [📌 rebase requirement]
    • #commits>1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • -conflict [📌 rebase requirement]
  • queue-position=-1 [📌 rebase requirement]

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

Please kindly set the merge label once you are satisfied this is not borked.

@Mikolaj
Copy link
Member

Mikolaj commented May 1, 2024

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 geekosaur added the squash+merge me Tell Mergify Bot to squash-merge label May 1, 2024
@mergify mergify bot merged commit 815b141 into 3.12 May 1, 2024
47 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9886 branch May 1, 2024 19:44
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label May 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants