Magnus pushed to branch wip/mangoiv/ci-stages at Glasgow Haskell Compiler / GHC

WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below.

Deleted commits:

1 changed file:

Changes:

  • .gitlab/ci.sh
    ... ... @@ -697,9 +697,9 @@ function test_hadrian() {
    697 697
         return
    
    698 698
       # If we have set CROSS_EMULATOR, then can't test using normal testsuite.
    
    699 699
       elif [ -n "${CROSS_EMULATOR:-}" ] && [[ "${CROSS_TARGET:-}" != *"wasm"* ]]; then
    
    700
    -    local instdir="$TOP/_build/install"
    
    701
    -    local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
    
    702
    -    install_bindist $dist_dir/ghc-*/ "$instdir"
    
    700
    +    # local instdir="$TOP/_build/install"
    
    701
    +    local test_compiler="$dist_dir/bin/${cross_prefix}ghc$exe"
    
    702
    +    # install_bindist $dist_dir/ghc-*/ "$instdir"
    
    703 703
         echo 'main = putStrLn "hello world"' > expected
    
    704 704
         run "$test_compiler" -package ghc "$TOP/.gitlab/hello.hs" -o hello
    
    705 705
     
    
    ... ... @@ -731,9 +731,9 @@ function test_hadrian() {
    731 731
           "runtest.opts+=--unexpected-output-dir=$TOP/unexpected-test-output" \
    
    732 732
           || fail "hadrian cabal-install test"
    
    733 733
       else
    
    734
    -    local instdir="$TOP/_build/install"
    
    735
    -    local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
    
    736
    -    install_bindist $dist_dir/ghc-*/ "$instdir"
    
    734
    +    # local instdir="$TOP/_build/install"
    
    735
    +    local test_compiler="$dist_dir/bin/${cross_prefix}ghc$exe"
    
    736
    +    # install_bindist $dist_dir/ghc-*/ "$instdir"
    
    737 737
     
    
    738 738
         # if [[ "${CI_JOB_NAME}" != *"windows"* ]] && [ -z "${CROSS_TARGET:-}" ]
    
    739 739
         # then