Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 5 commits into from
Apr 29, 2024
Merged

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

merged 5 commits into from
Apr 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 29, 2024

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

@ulysses4ever @mergify
CI: force MacOS jobs to use Intel runners (macos-13)
9474d03 
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
@ulysses4ever @mergify
CI: GitHub MacOS runners lost ghcup since 2024-04-27, so use haskell-…
69144fa 
…action/setup instead

(cherry picked from commit 082d952)
@ulysses4ever @mergify
fixup! more compat with new macos runners
3a40d55 
(cherry picked from commit 326a1f6)
@mergify mergify bot added the conflicts label Apr 29, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Apr 29, 2024

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

@mergify mergify bot mentioned this pull request Apr 29, 2024
Merged
2 tasks
@mergify mergify bot added the backport label Apr 29, 2024
@Mikolaj Mikolaj added the squash+merge me Tell Mergify Bot to squash-merge label Apr 29, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 29, 2024

Huh, that conflict is surprising.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 29, 2024

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
Copy link
Member

Mikolaj commented Apr 29, 2024

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

@ulysses4ever
Copy link
Collaborator

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

@ulysses4ever
Copy link
Collaborator

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

@geekosaur
Copy link
Collaborator

geekosaur commented Apr 29, 2024 •
edited
Loading

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
Copy link
Collaborator

Same failure.

@geekosaur
Copy link
Collaborator

geekosaur commented Apr 29, 2024 •
edited
Loading

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.

@geekosaur
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.
@ulysses4ever
Copy link
Collaborator

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

@mergify mergify bot merged commit d871c1e into 3.12 Apr 29, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9949 branch April 29, 2024 22:54
geekosaur added a commit that referenced this pull request Apr 29, 2024
@mergify @ulysses4ever @geekosaur
CI: force MacOS jobs to use Intel runners (macos-13) (backport #9949) (…
a58d8a2 
…#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 <a.pelenitsyn@gmail.com>
Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>
Mikolaj added a commit that referenced this pull request May 1, 2024
@Mikolaj
CI: stop validating GHC 7 (backport #9886) (#9957)
280aaa8 
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 <fa-ml@ariis.it>

* 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 <a.pelenitsyn@gmail.com>
Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

* 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
@mergify @Mikolaj
CI: stop validating GHC 7 (backport #9886) (#9957) (#9957)
815b141 
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 <fa-ml@ariis.it>

* 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 <a.pelenitsyn@gmail.com>
Co-authored-by: brandon s allbery kf8nh <allbery.b@gmail.com>

* 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 <281893+Mikolaj@users.noreply.github.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geekosaur geekosaur geekosaur approved these changes

Assignees
No one assigned
Labels
backport conflicts squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mikolaj @ulysses4ever @geekosaur