diff options
| author | mrkkrp <markkarpov92@gmail.com> | 2018-04-26 15:12:15 +0700 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-05-05 13:09:18 -0400 |
| commit | 56e8c6fc9d65fec11485bd02d437a753bc1a4ebe (patch) | |
| tree | 184ee2a1ff7e1b98607b5e8fa7b72cac84b80fc2 /.circleci/config.yml | |
| parent | b750dcc5d9e1df8505788a41d0cf0d92acd17f0d (diff) | |
| download | haskell-56e8c6fc9d65fec11485bd02d437a753bc1a4ebe.tar.gz | |
Update docker images to use GHC 8.4.2 and cabal-install-2.2
The ‘haskell’ images are not being updated and there is no image with GHC
8.4.2, so we probably should not use them anymore. I adapted Dockerfiles
used by those images so the end result is almost the same except we get
newer GHC and cabal-install.
Diffstat (limited to '.circleci/config.yml')
| -rw-r--r-- | .circleci/config.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 74b88b3b7d..a7d08b17aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -35,7 +35,7 @@ aliases: run: name: Configure command: | - setarch i386 ./configure --with-ghc=/opt/ghc-i386/8.2.2/bin/ghc + setarch i386 ./configure --with-ghc=/opt/ghc-i386/8.4.2/bin/ghc - &configure_bsd run: name: Configure @@ -90,7 +90,7 @@ jobs: "validate-x86_64-linux": resource_class: xlarge docker: - - image: ghcci/x86_64-linux:0.0.1 + - image: ghcci/x86_64-linux:0.0.2 environment: <<: *buildenv GHC_COLLECTOR_FLAVOR: x86_64-linux @@ -151,7 +151,7 @@ jobs: "validate-hadrian-x86_64-linux": resource_class: xlarge docker: - - image: ghcci/x86_64-linux:0.0.1 + - image: ghcci/x86_64-linux:0.0.2 environment: <<: *buildenv steps: @@ -165,7 +165,7 @@ jobs: "validate-x86_64-linux-unreg": resource_class: xlarge docker: - - image: ghcci/x86_64-linux:0.0.1 + - image: ghcci/x86_64-linux:0.0.2 environment: <<: *buildenv steps: @@ -181,7 +181,7 @@ jobs: "validate-x86_64-linux-llvm": resource_class: xlarge docker: - - image: ghcci/x86_64-linux:0.0.1 + - image: ghcci/x86_64-linux:0.0.2 environment: <<: *buildenv BUILD_FLAVOUR: perf-llvm @@ -206,7 +206,7 @@ jobs: "validate-x86_64-linux-debug": resource_class: xlarge docker: - - image: ghcci/x86_64-linux:0.0.1 + - image: ghcci/x86_64-linux:0.0.2 environment: BUILD_FLAVOUR: devel2 <<: *buildenv @@ -223,7 +223,7 @@ jobs: "validate-i386-linux": resource_class: xlarge docker: - - image: ghcci/i386-linux:0.0.1 + - image: ghcci/i386-linux:0.0.2 environment: <<: *buildenv GHC_COLLECTOR_FLAVOR: i386-linux @@ -242,7 +242,7 @@ jobs: "validate-x86_64-fedora": resource_class: xlarge docker: - - image: ghcci/x86_64-linux-fedora:0.0.2 + - image: ghcci/x86_64-linux-fedora:0.0.3 environment: <<: *buildenv GHC_COLLECTOR_FLAVOR: x86_64-fedora |