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.

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

GitLab CI: Shake up available platforms (backport #9865) #9898

Merged
merged 4 commits into from
Apr 16, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 16, 2024

Draft status pending #9864 resolution fixing the Darwin builds.

added platforms

(These are the platforms available in https://gitlab.haskell.org/ghc/ci-images/)

i386-linux-deb10

x86_64-linux-deb10
x86_64-linux-deb11
x86_64-linux-deb12
x86_64-linux-fedora36
x86_64-linux-fedora38
x86_64-linux-ubuntu22_04

aarch64-linux-deb12

i386-linux_alpine3_15
i386-linux_alpine3_17

x86_64-linux_alpine3_15
x86_64-linux_alpine3_17
x86_64-linux_alpine3_18

aarch64-linux_alpine3_18

other details

All Linux builds run on Docker images that come from https://gitlab.haskell.org/ghc/ci-images/. These images already include Cabal and GHC. But the CI script separately downloaded them. I changed the script to just use the tools that are already available.

Fixes #9861 .


This is an automatic backport of pull request #9865 done by Mergify.

(cherry picked from commit 3792f65)
(cherry picked from commit 6b6c684)
* Use `arch` explicitly in both jobs. I don't know why x86_64 is the
  default, and I don't like it.

* Stop using brew. This means a toolchain needs to already be installed
  where CI is run. This is the case today, although it's a bit fragile
  and I'll probably revisit it.

* Use a matrix build to clean up the yml.

* Use GHC 9.8.2 to work around GHC#24050

(cherry picked from commit 1f60a97)
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'm getting emails about cabal gitlab pipeline failing probably from 3.12 branch, so let's fix it. In any case, it's less noise if the pipeline corresponding to the 3.12.0.0 release is not displayed as broken (even if the breakage is for non-critical reasons).

@Mikolaj Mikolaj requested a review from ffaf1 April 16, 2024 15:15
@Mikolaj Mikolaj added the merge me Tell Mergify Bot to merge label Apr 16, 2024
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

Hm, manual squash, or is this destined to be the test case for #9879?

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

Aren't these commits well delineated for readability?

@geekosaur
Copy link
Collaborator

Mm, probably.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

Don't worry, we'll try out your new shiny toy soon. ;D

@mergify mergify bot merged commit 983fdcd into 3.12 Apr 16, 2024
53 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9865 branch April 16, 2024 17:20
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 18, 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 merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants