Serge S. Gulin pushed to branch wip/T25974 at Glasgow Haskell Compiler / GHC
Commits:
-
b347c867
by Serge S. Gulin at 2025-05-10T01:42:34+04:00
-
f017540c
by Serge S. Gulin at 2025-05-10T12:09:02+04:00
2 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: 3f387f623141bae4c59f4ce235c13561856f6a01
|
|
| 5 | + DOCKER_REV: 719761ba598220b9576f82aab39e442cc1a1cf1f
|
|
| 6 | 6 | |
| 7 | 7 | # Sequential version number of all cached things.
|
| 8 | 8 | # Bump to invalidate GitLab CI cache.
|
| ... | ... | @@ -869,6 +869,9 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } |
| 869 | 869 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure"
|
| 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 | + -- We use "--enable-distro-toolchain" due of TOOLCHAIN_SOURCE="env", so we have to manually copy
|
|
| 873 | + -- bootstrap's compiler mingw into `_build` because binary-dist-dir requires it at Windows.
|
|
| 874 | + , "cp -r ../.wine/drive_c/msys64/opt/ghc-bootstrap/mingw ./_build/"
|
|
| 872 | 875 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian"
|
| 873 | 876 | , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian"
|
| 874 | 877 | ]
|