CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) #9956

mergify · 2024-04-29T18:27:04Z

GitHub just switched macos-latest to the ARM chips (now aliasing 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, let's stay on the previous version of the runner.

Template Β: This PR does not modify cabal behaviour (documentation, tests, refactoring, etc.)

Include the following checklist in your PR:

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).

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

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) # Conflicts: # .github/workflows/validate.yml

…action/setup instead (cherry picked from commit 082d952)

(cherry picked from commit 326a1f6)

mergify · 2024-04-29T18:27:06Z

Cherry-pick of d36e0d0 has failed:

On branch mergify/bp/3.12/pr-9949
Your branch is up to date with 'origin/3.12'.

You are currently cherry-picking commit d36e0d097.
  (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)

Changes to be committed:
	modified:   .github/workflows/bootstrap.yml

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

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

Mikolaj · 2024-04-29T18:28:16Z

Huh, that conflict is surprising.

Mikolaj · 2024-04-29T18:31:11Z

Unless it's just because we haven't backported #9886 yet, not to delay the release.. Let me backport it first to make the conflict resolution easier.

Mikolaj · 2024-04-29T18:32:58Z

Nope, #9957 has conflicts of its own. Are we missing yet another backport? I thought I accounted for all of them...

.github/workflows/validate.yml

ulysses4ever · 2024-04-29T19:35:18Z

Build failed at some point but I can't see where.

ulysses4ever · 2024-04-29T19:36:49Z

Optimistically restart. Link for the failure https://github.com/haskell/cabal/actions/runs/8884161168/job/24392620850?pr=9956

geekosaur · 2024-04-29T19:38:40Z

https://github.com/haskell/cabal/actions/runs/8884161168/job/24392620850?pr=9956#step:13:1485
but I don't see why this would suddenly come up now.

geekosaur · 2024-04-29T19:52:22Z

Same failure.

geekosaur · 2024-04-29T20:03:53Z

Got it. #9551 added an import list to System.Process.Internals, which is protecting us on master from a possibly recent change in process.

ETA: yep, just uploaded today.

because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using.

ulysses4ever · 2024-04-29T20:34:43Z

Thanks! I'm pretty much AFK till the end of today.

…#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]>

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

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>

ulysses4ever added 3 commits April 29, 2024 18:26

CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-…

69144fa

…action/setup instead (cherry picked from commit 082d952)

fixup! more compat with new macos runners

3a40d55

(cherry picked from commit 326a1f6)

mergify bot added the conflicts label Apr 29, 2024

mergify bot mentioned this pull request Apr 29, 2024

CI: force MacOS jobs to use Intel runners (macos-13) #9949

Merged

2 tasks

mergify bot added the backport label Apr 29, 2024

Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Apr 29, 2024

!fixup resolve conflicts

b38d082

geekosaur requested changes Apr 29, 2024

View reviewed changes

.github/workflows/validate.yml Show resolved Hide resolved

geekosaur approved these changes Apr 29, 2024

View reviewed changes

copy an import list from #9551

7579201

because `System.Process.Internals` just (like, within the past hour or so) started exporting a name we are using.

mergify bot merged commit d871c1e into 3.12 Apr 29, 2024

mergify bot deleted the mergify/bp/3.12/pr-9949 branch April 29, 2024 22:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) #9956

CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) #9956

Uh oh!

mergify bot commented Apr 29, 2024

Uh oh!

mergify bot commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

geekosaur commented Apr 29, 2024 •

edited

Loading

Uh oh!

geekosaur commented Apr 29, 2024

Uh oh!

geekosaur commented Apr 29, 2024 •

edited

Loading

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

Uh oh!

CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) #9956

CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) #9956

Uh oh!

Conversation

mergify bot commented Apr 29, 2024

Uh oh!

mergify bot commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Mikolaj commented Apr 29, 2024

Uh oh!

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

geekosaur commented Apr 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

geekosaur commented Apr 29, 2024

Uh oh!

geekosaur commented Apr 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ulysses4ever commented Apr 29, 2024

Uh oh!

Uh oh!

geekosaur commented Apr 29, 2024 •

edited

Loading

geekosaur commented Apr 29, 2024 •

edited

Loading