Skip to content

Backport #10843: Use a newer ci-images for centos7 #10884

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

Merged
merged 1 commit into from
Mar 29, 2025
Merged

Backport #10843: Use a newer ci-images for centos7 #10884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ linux:
- ARCH: x86_64
TAG: x86_64-linux
OS:
- centos7
- deb9
- deb10
- deb11
Expand All @@ -50,6 +49,14 @@ linux:
- ubuntu18_04
- ubuntu20_04
- ubuntu22_04
# Pull this one from the future, since it's missing.
# We can't move the entire file to this DOCKER_REV, because
# i386-linux-deb9 is missing from it.
- ARCH: x86_64
TAG: x86_64-linux
OS: centos7
DOCKER_REV: f2d12519f45a13a61fcca03a949f927ceead6492

- ARCH: aarch64
TAG: aarch64-linux
OS:
Expand Down
9 changes: 8 additions & 1 deletion .gitlab/ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ set -Eeuo pipefail

source "$CI_PROJECT_DIR/.gitlab/common.sh"

if [[ "$(uname)" == "Linux" ]]; then
## Figure out how to get the Haskell toolchain.

# For backport, the centos image no longer has the right GHC version, so use
# ghcup.
if [[ -f /etc/os-release && "$(grep ^ID /etc/os-release)" =~ "centos" ]]; then
. "$CI_PROJECT_DIR/.gitlab/ghcup.sh"
# All the other ones are fine.
elif [[ "$(uname)" == "Linux" ]]; then
export PATH="/opt/ghc/${GHC_VERSION}/bin:${PATH}"
# Not all runners use ci-images, so ghcup is used.
else
Expand Down
Loading