[commit: ghc] wip/enable-freebsd-ci: circleci: Reenable FreeBSD (9400c43)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/enable-freebsd-ci
Link       : http://ghc.haskell.org/trac/ghc/changeset/9400c43bcb433777cdba29caeb511941693b6348/ghc

>---------------------------------------------------------------

commit 9400c43bcb433777cdba29caeb511941693b6348
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Jul 24 11:43:06 2018 -0400

    circleci: Reenable FreeBSD


>---------------------------------------------------------------

9400c43bcb433777cdba29caeb511941693b6348
 .circleci/config.yml        | 23 +++++++++++------------
 .circleci/prepare-system.sh |  8 ++++----
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 298162e..c5b3fbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -283,18 +283,17 @@ workflows:
   version: 2
   validate:
     jobs:
-    - validate-x86_64-linux:
-        *trigger_on_tags
-    # FreeBSD disabled: https://github.com/haskell/unix/issues/102
-    # - validate-x86_64-freebsd
-    - validate-x86_64-darwin:
-        *trigger_on_tags
-    - validate-x86_64-linux-llvm
-    - validate-i386-linux:
-        *trigger_on_tags
-    - validate-hadrian-x86_64-linux
-    - validate-x86_64-fedora:
-        *trigger_on_tags
+    #- validate-x86_64-linux:
+    #    *trigger_on_tags
+    - validate-x86_64-freebsd
+    #- validate-x86_64-darwin:
+    #    *trigger_on_tags
+    #- validate-x86_64-linux-llvm
+    #- validate-i386-linux:
+    #    *trigger_on_tags
+    #- validate-hadrian-x86_64-linux
+    #- validate-x86_64-fedora:
+    #    *trigger_on_tags
 
   nightly:
     triggers:
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index df0da01..414f5a6 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -9,7 +9,6 @@ fail() {
 
 echo 'BUILD_SPHINX_HTML = NO' > mk/validate.mk
 echo 'BUILD_SPHINX_PDF = NO' >> mk/validate.mk
-hackage_index_state="@1522046735"
 
 cat > mk/build.mk <<EOF
 V=1
@@ -27,17 +26,18 @@ case "$(uname)" in
         # cross-compiling to FreeBSD
         add-apt-repository -y ppa:hvr/ghc
         apt-get update -qq
-        apt-get install -qy ghc-8.0.2 cabal-install-1.24 alex happy \
+        apt-get install -qy ghc-8.4.3 cabal-install alex happy \
                             ncurses-dev git make automake autoconf gcc perl \
                             python3 texinfo xz-utils lbzip2 patch
         cabal update
-        cabal install --reinstall hscolour --index-state=$hackage_index_state
+        cabal install --reinstall hscolour
         ln -s $HOME/.cabal/bin/HsColour /usr/local/bin/HsColour
+        ls -l /opt/ghc
 
         echo 'HADDOCK_DOCS = NO' >> mk/build.mk
         echo 'WERROR=' >> mk/build.mk
         # https://circleci.com/docs/2.0/env-vars/#interpolating-environment-variables-to-set-other-environment-variables
-        echo 'export PATH=/opt/ghc/bin:$PATH' >> $BASH_ENV
+        echo 'export PATH=/opt/ghc/8.4.3/bin:$PATH' >> $BASH_ENV
       else
         fail "TARGET=$target not supported"
       fi