[Git][ghc/ghc][wip/testing] Fix shell variable names for tools and remove nix-less Darwin code.

[davean]

davean pushed to branch wip/testing at Glasgow Haskell Compiler / GHC


Commits:
8734530a by davean at 2020-10-09T23:20:58-04:00
Fix shell variable names for tools and remove nix-less Darwin code.
- - - - -


1 changed file:

- .gitlab/ci.sh


Changes:

=====================================
.gitlab/ci.sh
=====================================
@@ -92,17 +92,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}"
@@ -127,9 +116,9 @@ function set_toolchain_paths() {
       # we provide these handy fallbacks in case the
       # script isn't run from within a GHC CI docker image.
       if [ -z "$GHC" ]; then GHC="$(which ghc)"; fi
-      if [ -z "$CABAL" ]; then GHC="$(which cabal)"; fi
-      if [ -z "$HAPPY" ]; then GHC="$(which happy)"; fi
-      if [ -z "$ALEX" ]; then GHC="$(which alex)"; fi
+      if [ -z "$CABAL" ]; then CABAL="$(which cabal)"; fi
+      if [ -z "$HAPPY" ]; then HAPPY="$(which happy)"; fi
+      if [ -z "$ALEX" ]; then ALEX="$(which alex)"; fi
   fi
 
   export GHC
@@ -149,10 +138,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 at gitlab-haskell.org"



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8734530a2a723340092700cec9487728bcb48520

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/8734530a2a723340092700cec9487728bcb48520
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201009/9b91daba/attachment-0001.html>