[Git][ghc/ghc][wip/js-staging] CI take N+2

[Sylvain Henry (@hsyl20)]

Sylvain Henry pushed to branch wip/js-staging at Glasgow Haskell Compiler / GHC


Commits:
e3d13211 by Sylvain Henry at 2022-11-08T12:05:08+01:00
CI take N+2

- - - - -


3 changed files:

- .gitlab/ci.sh
- .gitlab/gen_ci.hs
- .gitlab/jobs.yaml


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -597,7 +597,7 @@ function test_hadrian() {
   if [[ "${CROSS_EMULATOR:-}" == "NOT_SET" ]]; then
     info "Cannot test cross-compiled build without CROSS_EMULATOR being set."
     return
-  elif [[ "${CROSS_EMULATOR:-}" != "NOT_NEEDED" ]]; then
+  elif [ -n "${CROSS_EMULATOR:-}" ]; then
     local instdir="$TOP/_build/install"
     local test_compiler="$instdir/bin/${cross_prefix}ghc$exe"
     install_bindist _build/bindist/ghc-*/ "$instdir"


=====================================
.gitlab/gen_ci.hs
=====================================
@@ -652,7 +652,7 @@ job arch opsys buildConfig = (jobName, Job {..})
             Nothing -> mempty
             Just _  -> "CROSS_EMULATOR" =: "NOT_SET" -- we need an emulator but it isn't set. Won't run the testsuite
           Emulator s       -> "CROSS_EMULATOR" =: s
-          NoEmulatorNeeded -> "CROSS_EMULATOR" =: "NOT_NEEDED"
+          NoEmulatorNeeded -> mempty
       , if withNuma buildConfig then "ENABLE_NUMA" =: "1" else mempty
       ]
 


=====================================
.gitlab/jobs.yaml
=====================================
@@ -1384,7 +1384,6 @@
       "BUILD_FLAVOUR": "release",
       "CONFIGURE_ARGS": "--with-intree-gmp",
       "CONFIGURE_WRAPPER": "emconfigure",
-      "CROSS_EMULATOR": "NOT_NEEDED",
       "CROSS_TARGET": "js-unknown-ghcjs",
       "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release",
       "XZ_OPT": "-9"
@@ -3928,7 +3927,6 @@
       "BUILD_FLAVOUR": "release",
       "CONFIGURE_ARGS": "--with-intree-gmp",
       "CONFIGURE_WRAPPER": "emconfigure",
-      "CROSS_EMULATOR": "NOT_NEEDED",
       "CROSS_TARGET": "js-unknown-ghcjs",
       "TEST_ENV": "x86_64-linux-deb11-int_native-cross_js-unknown-ghcjs-release"
     }



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

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/e3d1321184545299a94ad14bff31927b141e90b2
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/20221108/0c453b89/attachment-0001.html>