CircleCI: More cleanup

4 files changed, 29 insertions, 14 deletions

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ebf5737151..8bb9306103 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -110,7 +110,7 @@ jobs:
   "validate-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       <<: *buildenv
       GHC_COLLECTOR_FLAVOR: x86_64-linux
@@ -181,7 +181,7 @@ jobs:
   "validate-hadrian-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       <<: *buildenv
     steps:
@@ -196,7 +196,7 @@ jobs:
   "validate-x86_64-linux-unreg":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       <<: *buildenv
       TEST_ENV: x86_64-linux-unreg
@@ -215,7 +215,7 @@ jobs:
   "validate-x86_64-linux-llvm":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       <<: *buildenv
       BUILD_FLAVOUR: perf-llvm
@@ -243,7 +243,7 @@ jobs:
   "validate-x86_64-linux-debug":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       BUILD_FLAVOUR: devel2
       <<: *buildenv
@@ -264,7 +264,7 @@ jobs:
   "validate-i386-linux":
     resource_class: xlarge
     docker:
-      - image: ghcci/i386-linux:0.0.5
+      - image: ghcci/i386-linux:0.0.6
     environment:
       <<: *buildenv
       GHC_COLLECTOR_FLAVOR: i386-linux
@@ -286,7 +286,7 @@ jobs:
   "validate-x86_64-fedora":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux-fedora:0.0.15
+      - image: ghcci/x86_64-linux-fedora:0.0.16
     environment:
       <<: *buildenv
       GHC_COLLECTOR_FLAVOR: x86_64-fedora
@@ -308,7 +308,7 @@ jobs:
   "slow-validate-x86_64-linux":
     resource_class: xlarge
     docker:
-      - image: ghcci/x86_64-linux:0.0.5
+      - image: ghcci/x86_64-linux:0.0.7
     environment:
       <<: *buildenv
       GHC_COLLECTOR_FLAVOR: x86_64-linux
diff --git a/.circleci/images/i386-linux/Dockerfile b/.circleci/images/i386-linux/Dockerfile
index 13a5721d8c..47d19cc05b 100644
--- a/.circleci/images/i386-linux/Dockerfile
+++ b/.circleci/images/i386-linux/Dockerfile
@@ -7,12 +7,15 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286
 RUN apt-get update -qq
 
 # Core build utilities
-RUN apt-get install -qy git make automake autoconf gcc perl python3 texinfo xz-utils lbzip2 bzip2 patch openssh-client sudo curl zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev ca-certificates g++ cabal-install-2.2 ghc-8.4.2 happy alex
+RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \
+    ca-certificates g++ git curl make automake autoconf gcc \
+    perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo
 
 # Documentation tools
 RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra
 
-ENV PATH /home/ghc/.cabal/bin:/home/ghc/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.4.2/bin:$PATH
+# Core build utilities
+RUN apt-get install -qy libgmp-dev:i386
 
 # Get i386 GHC bindist for 32 bit CI builds.
 RUN cd /tmp && curl https://downloads.haskell.org/~ghc/8.4.2/ghc-8.4.2-i386-deb8-linux.tar.xz | tar -Jx
@@ -21,11 +24,21 @@ RUN cd /tmp/ghc-8.4.2 && make install
 RUN rm -rf /tmp/ghc-8.4.2
 ENV PATH /opt/ghc-i386/8.4.2/bin:$PATH
 
+# Get Cabal
+RUN cd /tmp && \
+    curl https://www.haskell.org/cabal/release/cabal-install-2.2.0.0/cabal-install-2.2.0.0-i386-unknown-linux.tar.gz | tar -zx && \
+    mv cabal /usr/local/bin/cabal
+
 # Create a normal user.
 RUN adduser ghc --gecos "GHC builds" --disabled-password
 RUN echo "ghc ALL = NOPASSWD : ALL" > /etc/sudoers.d/ghc
 USER ghc
 
+# Build Haskell tools
+RUN cabal update && \
+    cabal install hscolour happy alex
+ENV PATH /home/ghc/.cabal/bin:$PATH
+
 WORKDIR /home/ghc/
 
 CMD ["bash"]
diff --git a/.circleci/images/x86_64-linux-fedora/Dockerfile b/.circleci/images/x86_64-linux-fedora/Dockerfile
index 959231b0b7..0ed546ca35 100644
--- a/.circleci/images/x86_64-linux-fedora/Dockerfile
+++ b/.circleci/images/x86_64-linux-fedora/Dockerfile
@@ -42,7 +42,8 @@ USER ghc
 WORKDIR /home/ghc/
 
 # Install Alex, Happy, and HsColor with Cabal
-RUN cabal update && cabal install alex happy hscolour
+RUN cabal update && \
+    cabal install hscolour happy alex
 ENV PATH /home/ghc/.cabal/bin:$PATH
 
 CMD ["bash"]
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index 9fe713e329..5360645802 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -7,8 +7,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys F6F88286
 RUN apt-get update -qq
 
 # Core build utilities
-RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev
-    ca-certificates g++ git curl make automake autoconf gcc
+RUN apt-get install -qy zlib1g-dev libtinfo-dev libsqlite3-0 libsqlite3-dev \
+    ca-certificates g++ git curl make automake autoconf gcc \
     perl python3 texinfo xz-utils lbzip2 patch openssh-client sudo
 
 # Documentation tools
@@ -17,7 +17,7 @@ RUN apt-get install -qy python3-sphinx texlive-xetex texlive-latex-extra
 # Basic Haskell toolchain
 RUN apt-get install -qy cabal-install-2.2 ghc-8.4.2
 
-ENV PATH /home/ghc/.cabal/bin:/home/ghc/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.4.2/bin:$PATH
+ENV PATH /home/ghc/.local/bin:/opt/cabal/2.2/bin:/opt/ghc/8.4.2/bin:$PATH
 
 # Create a normal user.
 RUN adduser ghc --gecos "GHC builds" --disabled-password
@@ -27,6 +27,7 @@ USER ghc
 # Build Haskell tools
 RUN cabal update && \
     cabal install hscolour happy alex
+ENV PATH /home/ghc/.cabal/bin:$PATH
 
 WORKDIR /home/ghc/