diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-04-27 10:18:59 +0800 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2021-05-31 11:54:50 -0400 |
| commit | 6731f9234d59a0b566f1a9ce4ee343b0582f805d (patch) | |
| tree | ed185ea688d957a3d222dce99707d34d16e85893 | |
| parent | e3c244f5b599884424d3134986423a13a95fbe0d (diff) | |
| download | haskell-6731f9234d59a0b566f1a9ce4ee343b0582f805d.tar.gz | |
[ci] no more brew or pip
We pull dependencies (reliably) via nix, and open up nix where
needed.
(cherry picked from commit cd0a9d2130c7dce608a1a249ee823278a49cbad2)
| -rwxr-xr-x | .gitlab/ci.sh | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index ae565fe2ff..8a313fc4d6 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -98,17 +98,6 @@ mkdir -p "$TOP/tmp" export TMP="$TOP/tmp" export TEMP="$TOP/tmp" -function darwin_setup() { - # It looks like we already have python2 here and just installing python3 - # does not work. - brew upgrade python - brew install ghc cabal-install ncurses gmp - - pip3 install sphinx - # PDF documentation disabled as MacTeX apparently doesn't include xelatex. - #brew cask install mactex -} - function show_tool() { local tool="$1" info "$tool = ${!tool}" @@ -164,10 +153,6 @@ function setup() { if [[ -n "$needs_toolchain" ]]; then setup_toolchain fi - case "$(uname)" in - Darwin) darwin_setup ;; - *) ;; - esac # Make sure that git works git config user.email "ghc-ci@gitlab-haskell.org" |