Skip to content

GitLab CI: Shake up available platforms #9865

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
Merged
mergify merged 4 commits into from
Apr 16, 2024
Merged

GitLab CI: Shake up available platforms #9865

mergify merged 4 commits into from
Apr 16, 2024

Conversation

@chreekat
Copy link
Collaborator

@chreekat chreekat commented Apr 4, 2024 •
edited
Loading

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 .

@chreekat
Copy link
Collaborator Author

chreekat commented Apr 4, 2024

I'm happy to also merge this now and work to reestablish Darwin jobs separately.

@chreekat
Copy link
Collaborator Author

chreekat commented Apr 4, 2024

x86_64-darwin worked, but aarch64-darwin got confused (https://gitlab.haskell.org/haskell/cabal/-/jobs/1825661).

ld: warning: ignoring file /private/var/lib/gitlab-runner/builds/LZcoKNnK/0/haskell/cabal/dist-newstyle/build/aarch64-osx/ghc-9.6.2/hackage-security-0.6.2.4/build/libHShackage-security-0.6.2.4-inplace.a, building for macOS-arm64 but attempting to link with file built for macOS-arm64

building for macOS-arm64 but attempting to link with file built for macOS-arm64

🥲

@geekosaur
Copy link
Collaborator

geekosaur commented Apr 4, 2024

Linkers at their best…

@chreekat chreekat force-pushed the b/new-ci-images branch 2 times, most recently from 19a90bf to c3b488b Compare April 5, 2024 11:29
@chreekat chreekat marked this pull request as ready for review April 5, 2024 11:32
@chreekat
Copy link
Collaborator Author

chreekat commented Apr 5, 2024

pipeline status

@chreekat
Copy link
Collaborator Author

chreekat commented Apr 5, 2024

This is ready now.

I did a few extra things in c3b488b worth double checking.

Mikolaj
Mikolaj approved these changes Apr 5, 2024
View reviewed changes
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.

LGTM

@chreekat chreekat added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Apr 13, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

@mergify refresh

@mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024

refresh

✅ Pull request refreshed

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

@mergify queue

@mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024 •
edited
Loading

queue

🛑 The pull request has been removed from the queue default

Details

The pull request can't be updated.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

mergify is really fussy today. Let me try to insist...

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

@mergify rebase

chreekat added 4 commits April 16, 2024 11:26
@chreekat @Mikolaj
Simplify job names
3792f65
@chreekat @Mikolaj
Only use ghcup where needed
6b6c684
@chreekat @Mikolaj
Update ci-images pin and bootstrap versions
50c0c0f
@chreekat @Mikolaj
Rework Darwin jobs
1f60a97 
* 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
@mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024

rebase

✅ Branch has been successfully rebased

@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

BTW, mergify should have set delay_passed after 2 days and now it's 4 days and it's not set, so I'm setting it manually.

@Mikolaj Mikolaj added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 16, 2024
@mergify mergify bot merged commit ff7bf03 into haskell:master Apr 16, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 16, 2024

@mergify backport 3.12

@mergify
Copy link
Contributor

mergify bot commented Apr 16, 2024 •
edited
Loading

backport 3.12

✅ Backports have been created

Details

@mergify mergify bot mentioned this pull request Apr 16, 2024
Merged
mergify bot added a commit that referenced this pull request Apr 16, 2024
@mergify
Merge pull request #9898 from haskell/mergify/bp/3.12/pr-9865
983fdcd 
GitLab CI: Shake up available platforms (backport #9865)
@chreekat chreekat deleted the b/new-ci-images branch March 18, 2025 13:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Mikolaj Mikolaj Mikolaj approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees

No one assigned

Labels

continuous-integration merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Release CI early warning is failing

3 participants

@chreekat @geekosaur @Mikolaj