diff options
| author | Alp Mestanogullari <alpmestan@gmail.com> | 2019-11-09 00:17:20 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-11-13 07:07:28 -0500 |
| commit | b795637fc74ffb3ac2f37a50f25468a67bf54bc0 (patch) | |
| tree | a8c0581d70c8db413f4da370218b7fda70b40b23 | |
| parent | 2d4f9ad89cb7e79c1f90983bf4898a5f4e3c7457 (diff) | |
| download | haskell-b795637fc74ffb3ac2f37a50f25468a67bf54bc0.tar.gz | |
hadrian: fix Windows CI script
By only using 'export' from within bash commands.
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 09ed198547..378e14d258 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -770,9 +770,8 @@ 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 - - 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" + - bash -c "export TOP=$(pwd); cd _build/bindist/ghc-*/ && PATH=$TOP/toolchain/bin:$PATH ./configure --prefix=$TOP/_build/install && make install && cd ../../../" + - bash -c "export TOP=$(pwd); PATH=$TOP/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: |