[commit: ghc] master: Build quick flavor and run some tests on Windows (df2c3b3)

git at git.haskell.org git at git.haskell.org
Tue Feb 27 16:44:39 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/df2c3b3364834d2fd038192c89348fc50a2e0475/ghc

>---------------------------------------------------------------

commit df2c3b3364834d2fd038192c89348fc50a2e0475
Author: mrkkrp <mark.karpov at tweag.io>
Date:   Fri Feb 16 18:53:31 2018 +0700

    Build quick flavor and run some tests on Windows
    
    This build fits into the 90 minutes window.


>---------------------------------------------------------------

df2c3b3364834d2fd038192c89348fc50a2e0475
 .appveyor.sh | 15 +++++++++++++--
 appveyor.yml |  2 +-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.appveyor.sh b/.appveyor.sh
index 436e54b..b7fde23 100644
--- a/.appveyor.sh
+++ b/.appveyor.sh
@@ -1,5 +1,8 @@
 # Configure the environment
 MSYSTEM=MINGW64
+THREADS=3
+SKIP_PERF_TESTS=YES
+BUILD_FLAVOUR=quick
 source /etc/profile || true # a terrible, terrible workaround for msys2 brokenness
 
 # Don't set -e until after /etc/profile is sourced
@@ -35,11 +38,19 @@ case "$1" in
         # Build the compiler
         ./boot
         ./configure --enable-tarballs-autodownload
-        make -j2
+        cat <<EOF >> mk/build.mk
+        BuildFlavour=$BUILD_FLAVOUR
+        ifneq "\$(BuildFlavour)" ""
+        include mk/flavours/\$(BuildFlavour).mk
+        endif
+EOF
+        make -j$THREADS
         ;;
 
     "test")
-        make binary_dist
+        # This does not finish in time.
+        # make fasttest THREADS=$THREADS
+        make binary-dist
         7z a ghc-windows.zip *.tar.xz
         ;;
 
diff --git a/appveyor.yml b/appveyor.yml
index 7ccf2e0..bcf35a0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,6 @@ build_script:
   - bash .appveyor.sh test
 
 artifacts:
-  - path: C:\projects\ghc\ghc-windows.zip
+  - path: ghc-windows.zip
     name: GHC Windows bindist
     type: zip



More information about the ghc-commits mailing list