[Git][ghc/ghc][wip/javascript-backend] Try to fix CI

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/javascript-backend at Glasgow Haskell Compiler / GHC


Commits:
3dc7faae by Sylvain Henry at 2022-11-16T15:15:47+01:00
Try to fix CI

- disable bignum backend check using the interpreter
- disable stage1 check that doesn't seem to work with cross-compilers
- fix compiler program name for cross-compilers

- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -620,10 +620,11 @@ function test_hadrian() {
       "runtest.opts+=${RUNTEST_ARGS:-}" || fail "hadrian cabal-install test"
   else
     local instdir="$TOP/_build/install"
-    local test_compiler="$instdir/bin/ghc$exe"
+    local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
     install_bindist _build/bindist/ghc-*/ "$instdir"
 
-    if [[ "${WINDOWS_HOST}" == "no" ]]; then
+    if [[ "${WINDOWS_HOST}" == "no" ]] && [ -z "${CROSS_TARGET:-}" ]
+    then
       run_hadrian \
         test \
         --test-root-dirs=testsuite/tests/stage1 \
@@ -632,10 +633,14 @@ function test_hadrian() {
       info "STAGE1_TEST=$?"
     fi
 
-    # Ensure the resulting compiler has the correct bignum-flavour
-    test_compiler_backend=$(${test_compiler} -e "GHC.Num.Backend.backendName")
-    if [ $test_compiler_backend != "\"$BIGNUM_BACKEND\"" ]; then
-      fail "Test compiler has a different BIGNUM_BACKEND ($test_compiler_backend) thean requested ($BIGNUM_BACKEND)"
+    # Ensure the resulting compiler has the correct bignum-flavour,
+    # except for cross-compilers as they may not support the interpreter
+    if [ -z "${CROSS_TARGET:-}" ]
+    then
+      test_compiler_backend=$(${test_compiler} -e "GHC.Num.Backend.backendName")
+      if [ $test_compiler_backend != "\"$BIGNUM_BACKEND\"" ]; then
+        fail "Test compiler has a different BIGNUM_BACKEND ($test_compiler_backend) thean requested ($BIGNUM_BACKEND)"
+      fi
     fi
 
     # If we are doing a release job, check the compiler can build a profiled executable



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3dc7faae8ddb882c7c5c62306f05b0e31d55e0c7

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/3dc7faae8ddb882c7c5c62306f05b0e31d55e0c7
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221116/00936c70/attachment-0001.html>