diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 23:23:56 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-12-21 23:23:56 -0500 |
| commit | 4ae6aa398d05f764563e95d77a5e3e9961fb73ac (patch) | |
| tree | 3f3f27c8e4e1d9f07f5f910618cedb795d2895b0 /.gitlab | |
| parent | b154838b5f3e773cf95ab91937b7ad44354fd279 (diff) | |
| download | haskell-4ae6aa398d05f764563e95d77a5e3e9961fb73ac.tar.gz | |
gitlab-ci: Fix Darwin build
Previously the toolchain directory was wiped away by git clean.
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/darwin-init.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitlab/darwin-init.sh b/.gitlab/darwin-init.sh index e17c7c77fe..ba5de9db35 100644 --- a/.gitlab/darwin-init.sh +++ b/.gitlab/darwin-init.sh @@ -12,7 +12,9 @@ fi if [ ! -e $toolchain/bin/ghc ]; then mkdir -p tmp cd tmp - curl https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-x86_64-apple-darwin.tar.xz | tar -xJ + ghc_tarball="https://downloads.haskell.org/~ghc/$GHC_VERSION/ghc-$GHC_VERSION-x86_64-apple-darwin.tar.xz" + echo "Fetching GHC from $ghc_tarball" + curl $ghc_tarball | tar -xJ cd ghc-$GHC_VERSION ./configure --prefix=$toolchain make install @@ -22,6 +24,7 @@ fi if [ ! -e $toolchain/bin/cabal ]; then cabal_tarball="https://downloads.haskell.org/~cabal/cabal-install-latest/cabal-install-2.4.1.0-x86_64-apple-darwin-sierra.tar.xz" + echo "Fetching cabal-install from $cabal_tarball" curl $cabal_tarball | tar -xz mv cabal $toolchain/bin fi |