diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-10-27 19:02:33 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2017-11-07 10:22:20 +0000 |
| commit | 6f665cccd7ef5cc4806d2c1e46a602bed7a7201d (patch) | |
| tree | 44a87e262f1dc69a3913837edc83a6536c0ee050 | |
| parent | b0cabc93edff61ba4d9de823171e49e851a1ff17 (diff) | |
| download | haskell-6f665cccd7ef5cc4806d2c1e46a602bed7a7201d.tar.gz | |
Sdist -> bindist -> tests
| -rwxr-xr-x | .circleci/build.sh | 22 | ||||
| -rwxr-xr-x | .circleci/prepare-system.sh | 9 |
2 files changed, 25 insertions, 6 deletions
diff --git a/.circleci/build.sh b/.circleci/build.sh index 74d5ea70d5..2cc1d0e6d5 100755 --- a/.circleci/build.sh +++ b/.circleci/build.sh @@ -8,9 +8,6 @@ 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 @@ -25,11 +22,28 @@ 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 test 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 diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh index 5d4d630bcb..7cf1a05f66 100755 --- a/.circleci/prepare-system.sh +++ b/.circleci/prepare-system.sh @@ -14,7 +14,10 @@ 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 + 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 cabal update cabal install --reinstall hscolour ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour @@ -24,7 +27,9 @@ 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 + apt-get install -qy \ + git openssh-client make automake autoconf gcc perl python3 \ + texinfo xz-utils xutils-dev curl cabal update cabal install --reinstall hscolour fi |