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

[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/cf29bd1acc54aea16d0fcf4551d3ae15f6a96e80/ghc

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

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

    circleci: Reenable FreeBSD


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

cf29bd1acc54aea16d0fcf4551d3ae15f6a96e80
 .circleci/config.yml                       | 25 ++++++++++++-------------
 .circleci/images/x86_64-freebsd/Dockerfile |  7 ++++++-
 .circleci/prepare-system.sh                |  7 ++++---
 3 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 55cb87f..74742d2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -115,7 +115,7 @@ jobs:
   "validate-x86_64-freebsd":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-freebsd
+      - image: ghcci/x86_64-freebsd:0.0.2
     environment:
       TARGET: FreeBSD
       <<: *buildenv
@@ -285,18 +285,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/images/x86_64-freebsd/Dockerfile b/.circleci/images/x86_64-freebsd/Dockerfile
index 9c51cc0..1b8bedd 100644
--- a/.circleci/images/x86_64-freebsd/Dockerfile
+++ b/.circleci/images/x86_64-freebsd/Dockerfile
@@ -1,6 +1,8 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update
+
+RUN apt-get install -y --no-install-recommends \
   autoconf \
   automake \
   bzip2 \
@@ -20,5 +22,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   wget \
   xz-utils
 
+# Documentation tools
+RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra
+
 COPY build-toolchain.sh /tmp/
 RUN /tmp/build-toolchain.sh x86_64
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index dbb1011..9a57464 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -29,17 +29,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