Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC Commits: ad393e1e by mangoiv at 2026-08-11T12:17:05+02:00 fixup! ci: build and test stage - - - - - 2 changed files: - .gitlab-ci.yml - .gitlab/ci.sh Changes: ===================================== .gitlab-ci.yml ===================================== @@ -448,10 +448,6 @@ lint-submods-branch: hadrian-ghc-in-ghci: stage: quick-build - needs: - - job: lint-linters - - job: lint-submods - optional: true image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-deb13:$DOCKER_REV" before_script: # workaround for docker permissions ===================================== .gitlab/ci.sh ===================================== @@ -619,7 +619,7 @@ function make_install_destdir() { # install the binary distribution in directory $1 to $2. function install_bindist() { - start_section install-bindist "Install bindist" + start_section install-bindist "Install bindist ($1 -> $2)" case "${CONFIGURE_WRAPPER:-}" in emconfigure) source "$EMSDK/emsdk_env.sh" ;; *) ;; @@ -648,7 +648,26 @@ function install_bindist() { end_section install-bindist } +function find_bindist_tar() { + local tar_files + tar_files=( *ghc*.tar.xz ) + if [[ ${#tar_files[@]} -gt 0 ]]; then + bindist_tar="${tar_files[0]}" + else + unset bindist_tar + fi +} + function test_hadrian() { + + find_bindist_tar + dist_dir="_build/bindist" + + if [ -n "$bindist_tar" ]; then + mkdir -p "$dist_dir" + tar -xf "$bindist_tar" -C "$dist_dir" + fi + check_msys2_deps _build/stage1/bin/ghc --version check_release_build @@ -680,7 +699,7 @@ function test_hadrian() { elif [ -n "${CROSS_EMULATOR:-}" ] && [[ "${CROSS_TARGET:-}" != *"wasm"* ]]; then local instdir="$TOP/_build/install" local test_compiler="$instdir/bin/${cross_prefix}ghc$exe" - install_bindist _build/bindist/ghc-*/ "$instdir" + install_bindist $dist_dir/ghc-*/ "$instdir" echo 'main = putStrLn "hello world"' > expected run "$test_compiler" -package ghc "$TOP/.gitlab/hello.hs" -o hello @@ -714,7 +733,7 @@ function test_hadrian() { else local instdir="$TOP/_build/install" local test_compiler="$instdir/bin/${cross_prefix}ghc$exe" - install_bindist _build/bindist/ghc-*/ "$instdir" + install_bindist $dist_dir/ghc-*/ "$instdir" if [[ "${CI_JOB_NAME}" != *"windows"* ]] && [ -z "${CROSS_TARGET:-}" ] then View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ad393e1eed0cfa0df3edcb1815072192... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/ad393e1eed0cfa0df3edcb1815072192... You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications: https://gitlab.haskell.org/-/profile/notifications | Help: https://gitlab.haskell.org/help