diff options
-rw-r--r-- | .appveyor.sh | 15 | ||||
-rw-r--r-- | appveyor.yml | 2 |
2 files changed, 14 insertions, 3 deletions
diff --git a/.appveyor.sh b/.appveyor.sh index 436e54b17a..b7fde233cf 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 7ccf2e03b9..bcf35a038c 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 |