diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-10-14 13:20:14 +0200 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-10-25 09:01:47 -0400 |
| commit | ecd89062985019592d1ed212dcc3b9905ceac315 (patch) | |
| tree | a915ad387455be477b7cd55cebbc96148d6f7cf6 | |
| parent | 87175e7870949438401213b8e28ee2722b3de6fd (diff) | |
| download | haskell-ecd89062985019592d1ed212dcc3b9905ceac315.tar.gz | |
hadrian/ci: run testsuite against a freshly produced and installed bindist
| -rw-r--r-- | .gitlab-ci.yml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6d9f778419..864420a003 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,8 +198,10 @@ lint-release-changelogs: - ./boot - ./configure $CONFIGURE_ARGS - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist - - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml - mv _build/bindist/ghc*.tar.xz ghc.tar.xz + - export TOP=$(pwd) + - cd _build/bindist/ghc-*/ && ./configure --prefix=$TOP/_build/install && make install && cd ../../../ + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml --test-compiler=$TOP/_build/install/bin/ghc cache: key: hadrian paths: @@ -365,8 +367,10 @@ validate-x86_64-darwin: - ./boot - ./configure $CONFIGURE_ARGS - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx binary-dist - - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml - mv _build/bindist/ghc*.tar.xz ghc.tar.xz + - export TOP=$(pwd) + - cd _build/bindist/ghc-*/ && ./configure --prefix=$TOP/_build/install && make install && cd ../../../ + - hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --docs=no-sphinx test --summary-junit=./junit.xml --test-compiler=$TOP/_build/install/bin/ghc after_script: - cp -Rf $HOME/.cabal cabal-cache artifacts: @@ -722,7 +726,9 @@ validate-x86_64-linux-fedora27: bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex' - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --flavour=Quick --docs=no-sphinx binary-dist" - mv _build/bindist/ghc*.tar.xz ghc.tar.xz - - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --flavour=quick test --summary-junit=./junit.xml --skip-perf" + - export TOP=$(pwd) + - bash -c "cd _build/bindist/ghc-*/ && PATH=`pwd`/toolchain/bin:$PATH ./configure --prefix=$TOP/_build/install && make install && cd ../../../" + - bash -c "PATH=`pwd`/toolchain/bin:$PATH hadrian/build.cabal.sh --flavour=$FLAVOUR -j`mk/detect-cpu-count.sh` --flavour=quick test --summary-junit=./junit.xml --skip-perf --test-compiler=$TOP/_build/install/bin/ghc" # skipping perf tests for now since we build a quick-flavoured GHC, # which might result in some broken perf tests? tags: |