Commit 4ae6aa39 authored by Ben Gamari's avatar Ben Gamari 🐢
Browse files

gitlab-ci: Fix Darwin build

Previously the toolchain directory was wiped away by git clean.
parent b154838b
...@@ -83,8 +83,9 @@ validate-x86_64-linux-deb8-hadrian: ...@@ -83,8 +83,9 @@ validate-x86_64-linux-deb8-hadrian:
.validate: .validate:
variables: variables:
TEST_TYPE: test TEST_TYPE: test
script: before_script:
- git clean -xdf && git submodule foreach git clean -xdf - git clean -xdf && git submodule foreach git clean -xdf
script:
- ./boot - ./boot
- ./configure $CONFIGURE_ARGS - ./configure $CONFIGURE_ARGS
- | - |
...@@ -117,6 +118,7 @@ validate-x86_64-darwin: ...@@ -117,6 +118,7 @@ validate-x86_64-darwin:
ac_cv_func_clock_gettime: "no" ac_cv_func_clock_gettime: "no"
LANG: "en_US.UTF-8" LANG: "en_US.UTF-8"
before_script: before_script:
- git clean -xdf && git submodule foreach git clean -xdf
- python .gitlab/fix-submodules.py - python .gitlab/fix-submodules.py
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --init --recursive - git submodule update --init --recursive
...@@ -143,6 +145,7 @@ validate-x86_64-darwin: ...@@ -143,6 +145,7 @@ validate-x86_64-darwin:
tags: tags:
- x86_64-linux - x86_64-linux
before_script: before_script:
- git clean -xdf && git submodule foreach git clean -xdf
- python3 .gitlab/fix-submodules.py - python3 .gitlab/fix-submodules.py
- git submodule sync --recursive - git submodule sync --recursive
- git submodule update --init --recursive - git submodule update --init --recursive
......
...@@ -12,7 +12,9 @@ fi ...@@ -12,7 +12,9 @@ fi
if [ ! -e $toolchain/bin/ghc ]; then if [ ! -e $toolchain/bin/ghc ]; then
mkdir -p tmp mkdir -p tmp
cd 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 cd ghc-$GHC_VERSION
./configure --prefix=$toolchain ./configure --prefix=$toolchain
make install make install
...@@ -22,6 +24,7 @@ fi ...@@ -22,6 +24,7 @@ fi
if [ ! -e $toolchain/bin/cabal ]; then 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" 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 curl $cabal_tarball | tar -xz
mv cabal $toolchain/bin mv cabal $toolchain/bin
fi fi
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment