Revert "Sdist -> bindist -> tests"
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Thu, 2 Nov 2017 11:15:11 +0000 (11:15 +0000)
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Tue, 7 Nov 2017 10:22:20 +0000 (10:22 +0000)
This reverts commit e1d38d6f7decee1e513d44bb3bce08bd004bfa4d.

.circleci/build.sh
.circleci/prepare-system.sh

index 2cc1d0e..74d98fa 100755 (executable)
@@ -8,6 +8,9 @@ fail() {
   exit 1
 }
 
+echo 'BUILD_SPHINX_HTML = NO' > mk/validate.mk
+echo 'BUILD_SPHINX_PDF = NO' >> mk/validate.mk
+
 cat > mk/build.mk <<EOF
 V=1
 HADDOCK_DOCS=YES
@@ -22,28 +25,11 @@ export SKIP_PERF_TESTS=YES
 export VERBOSE=2
 
 function run_build() {
-    mk/get-win32-tarballs.sh download all
-    ./boot
-    ./configure "$@"
-    make sdist
-    mkdir -p sdist-build-dir
-    pushd sdist-build-dir
-    shopt -s extglob
-    tar xvfJ ../sdistprep/ghc-*+([[:digit:]])-src.tar.xz sdist-build-dir
-    cd ghc-*
     ./boot
     ./configure "$@"
     make -j$THREADS
+    make fasttest
     make binary-dist
-    popd
-    mkdir -p bdist-test-dir
-    pushd bdist-test-dir
-    tar xvfJ ../sdist-build-dir/ghc-*/ghc-*.tar.xz
-    tar xvfJ ../sdistprep/ghc*testsuite.tar.xz
-    cd ghc-*
-    ./configure
-    # TODO: JUnit formatting for pretty CircleCI thing.
-    make test
 }
 
 case "$(uname)" in
index 7cf1a05..5d4d630 100755 (executable)
@@ -14,10 +14,7 @@ case "$(uname)" in
         # cross-compiling to FreeBSD
         add-apt-repository -y ppa:hvr/ghc
         apt-get update -qq
-        apt-get install -qy \
-                ghc-8.0.2 cabal-install alex happy ncurses-dev git \
-                openssh-client make automake autoconf gcc perl \
-                python3 texinfo xz-utils xutils-dev curl
+        apt-get install -qy ghc-8.0.2 cabal-install  alex happy ncurses-dev git openssh-client make automake autoconf gcc perl python3 texinfo xz-utils
         cabal update
         cabal install --reinstall hscolour
         ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
@@ -27,9 +24,7 @@ case "$(uname)" in
     else
       # assuming Ubuntu
       apt-get update -qq
-      apt-get install -qy \
-              git openssh-client make automake autoconf gcc perl python3 \
-              texinfo xz-utils xutils-dev curl
+      apt-get install -qy git openssh-client make automake autoconf gcc perl python3 texinfo xz-utils
       cabal update
       cabal install --reinstall hscolour
     fi