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 Update DOCKER_REV - - - - - f017540c by Serge S. Gulin at 2025-05-10T12:09:02+04:00 Copy mingw from boostrap compiler - - - - - 2 changed files: - .gitlab-ci.yml - .gitlab/generate-ci/gen_ci.hs Changes: ===================================== .gitlab-ci.yml ===================================== @@ -2,7 +2,7 @@ variables: GIT_SSL_NO_VERIFY: "1" # Commit of ghc/ci-images repository from which to pull Docker images - DOCKER_REV: 3f387f623141bae4c59f4ce235c13561856f6a01 + DOCKER_REV: 719761ba598220b9576f82aab39e442cc1a1cf1f # Sequential version number of all cached things. # Bump to invalidate GitLab CI cache. ===================================== .gitlab/generate-ci/gen_ci.hs ===================================== @@ -869,6 +869,9 @@ job arch opsys buildConfig = NamedJob { name = jobName, jobInfo = Job {..} } , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh configure" -- We have to trigger cabal build in an independent way to mitigate Wine hangs at MSYS2/Arm64EC , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l -c './hadrian/build-cabal clean'" + -- We use "--enable-distro-toolchain" due of TOOLCHAIN_SOURCE="env", so we have to manually copy + -- bootstrap's compiler mingw into `_build` because binary-dist-dir requires it at Windows. + , "cp -r ../.wine/drive_c/msys64/opt/ghc-bootstrap/mingw ./_build/" , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh build_hadrian" , "/opt/wine-arm64ec-msys2-deb12/bin/wine c:/msys64/usr/bin/bash.exe -l .gitlab/ci.sh test_hadrian" ] View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a21cee9058a065da148aaface05039d... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/a21cee9058a065da148aaface05039d... You're receiving this email because of your account on gitlab.haskell.org.