Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC
Commits:
-
a21cee90
by Serge S. Gulin at 2025-05-10T00:10:20+04:00
3 changed files:
Changes:
| ... | ... | @@ -2,7 +2,7 @@ variables: |
| 2 | 2 | GIT_SSL_NO_VERIFY: "1"
|
| 3 | 3 | |
| 4 | 4 | # Commit of ghc/ci-images repository from which to pull Docker images
|
| 5 | - DOCKER_REV: 8f318609d86acfbf3f0cc6a05784e14ba259080d
|
|
| 5 | + DOCKER_REV: 3f387f623141bae4c59f4ce235c13561856f6a01
|
|
| 6 | 6 | |
| 7 | 7 | # Sequential version number of all cached things.
|
| 8 | 8 | # Bump to invalidate GitLab CI cache.
|
| ... | ... | @@ -870,8 +870,7 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } |
| 870 | 870 | -- We have to trigger cabal build in an independent way to mitigate Wine hangs at MSYS2/Arm64EC
|
| 871 | 871 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'"
|
| 872 | 872 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian"
|
| 873 | - -- It builds, it is already a huge win at the moment of this commit
|
|
| 874 | - -- TODO: , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
|
| 873 | + , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
|
| 875 | 874 | ]
|
| 876 | 875 | | otherwise
|
| 877 | 876 | = [ "find libraries -name config.sub -exec cp config.sub {} \\;" | Darwin == opsys ] ++
|
| ... | ... | @@ -523,7 +523,8 @@ |
| 523 | 523 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup",
|
| 524 | 524 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure",
|
| 525 | 525 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'",
|
| 526 | - "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian"
|
|
| 526 | + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian",
|
|
| 527 | + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
|
| 527 | 528 | ],
|
| 528 | 529 | "stage": "full-build",
|
| 529 | 530 | "tags": [
|
| ... | ... | @@ -1280,7 +1281,8 @@ |
| 1280 | 1281 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh setup",
|
| 1281 | 1282 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure",
|
| 1282 | 1283 | "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'",
|
| 1283 | - "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian"
|
|
| 1284 | + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian",
|
|
| 1285 | + "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
|
| 1284 | 1286 | ],
|
| 1285 | 1287 | "stage": "full-build",
|
| 1286 | 1288 | "tags": [
|