[commit: ghc] wip/docker-ghcci: Install more earlier (3553bf2)

git at git.haskell.org git at git.haskell.org
Fri Mar 2 06:13:56 UTC 2018


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

On branch  : wip/docker-ghcci
Link       : http://ghc.haskell.org/trac/ghc/changeset/3553bf2b8d5b544cd6a37ddbb65e71beebaa26e0/ghc

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

commit 3553bf2b8d5b544cd6a37ddbb65e71beebaa26e0
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Mar 2 00:45:49 2018 -0500

    Install more earlier


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

3553bf2b8d5b544cd6a37ddbb65e71beebaa26e0
 .circleci/config.yml                     | 2 --
 .circleci/images/x86_64-linux/Dockerfile | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8507e23..fb3697e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -181,8 +181,6 @@ jobs:
       - run:
           name: Install LLVM
           command: |
-            apt-get update
-            apt-get install -y curl xz-utils
             curl http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-x86_64-linux-gnu-debian8.tar.xz | tar -xJC ..
             # See https://discuss.circleci.com/t/how-to-add-a-path-to-path-in-circle-2-0/11554/3
             echo "export PATH=`pwd`/../clang+llvm-5.0.0-x86_64-linux-gnu-debian8/bin:\$PATH" >> $BASH_ENV
diff --git a/.circleci/images/x86_64-linux/Dockerfile b/.circleci/images/x86_64-linux/Dockerfile
index 3eefa1b..8584e4a 100644
--- a/.circleci/images/x86_64-linux/Dockerfile
+++ b/.circleci/images/x86_64-linux/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update -qq
 RUN apt-get install -qy openssh-client
 
 RUN apt-get install -qy git make automake autoconf gcc perl python3 texinfo xz-utils lbzip2 patch
+RUN apt-get install -qy curl xz-utils
 
 RUN ln -s /home/ghc/.cabal/bin/HsColour /usr/local/bin/HsColour
 



More information about the ghc-commits mailing list