[Git][ghc/ghc][master] 2 commits: gitlab-ci: Configure bignum backend in Hadrian builds

[Marge Bot]

 Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
10434d60 by Ben Gamari at 2020-09-07T09:34:32-04:00
gitlab-ci: Configure bignum backend in Hadrian builds

- - - - -
d4bc9f0d by Ben Gamari at 2020-09-07T09:34:32-04:00
gitlab-ci: Use hadrian builds for Windows release artifacts

- - - - -


2 changed files:

- .gitlab-ci.yml
- .gitlab/ci.sh


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -856,13 +856,16 @@ validate-x86_64-linux-fedora27:
       - ghc.tar.xz
       - junit.xml
 
-validate-x86_64-windows-hadrian:
+.build-x86_64-windows-hadrian:
   extends: .build-windows-hadrian
   variables:
     MSYSTEM: MINGW64
-    TEST_ENV: "x86_64-windows-hadrian"
+    TEST_ENV: "x86_64-windows"
   cache:
-    key: "x86_64-windows-hadrian-$WINDOWS_TOOLCHAIN_VERSION"
+    key: "x86_64-windows-$WINDOWS_TOOLCHAIN_VERSION"
+
+validate-x86_64-windows-hadrian:
+  extends: .build-x86_64-windows-hadrian
 
 .build-windows-make:
   extends: .build-windows
@@ -903,16 +906,17 @@ nightly-x86_64-windows:
   variables:
     BUILD_FLAVOUR: "validate"
 
-# Normal Windows validate builds are profiled; that won't do for releases.
+# Normal Windows validate builds lack profiled libraries; that won't do for
+# releases.
 release-x86_64-windows:
   <<: *release
-  extends: .build-x86_64-windows-make
+  extends: .build-x86_64-windows-hadrian
   variables:
     BUILD_FLAVOUR: "perf"
-    #
+
 release-x86_64-windows-integer-simple:
   <<: *release
-  extends: .build-x86_64-windows-make
+  extends: .build-x86_64-windows-hadrian
   variables:
     BIGNUM_BACKEND: native
     BUILD_FLAVOUR: "perf"


=====================================
.gitlab/ci.sh
=====================================
@@ -427,10 +427,12 @@ function clean() {
 }
 
 function run_hadrian() {
+  if [ -z "$BIGNUM_BACKEND" ]; then BIGNUM_BACKEND="gmp"; fi
   run hadrian/build-cabal \
     --flavour="$FLAVOUR" \
     -j"$cores" \
     --broken-test="$BROKEN_TESTS" \
+    --bignum=$BIGNUM_BACKEND \
     $HADRIAN_ARGS \
     $@
 }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c5413fc62342f05d48e62f92c81a7f8a3259d3d7...d4bc9f0de7992f60bce403731019829f6248cc2c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c5413fc62342f05d48e62f92c81a7f8a3259d3d7...d4bc9f0de7992f60bce403731019829f6248cc2c
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/20200907/b6d7a927/attachment-0001.html>