From 8db036a4e031527185ac08b675cdc6148332470c Mon Sep 17 00:00:00 2001 From: John Ky Date: Tue, 2 Apr 2019 10:50:03 +1100 Subject: [PATCH 1/3] Upgrade to ghc-8.6.4 in Circle CI --- .circleci/config.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eab48d4..d78d0d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2.1 orbs: - haskell: haskell-works/haskell-build@1.6.2 + haskell: haskell-works/haskell-build@1.6.5 github: haskell-works/github-release@1.2.1 hackage: haskell-works/hackage@1.0.0 @@ -17,15 +17,15 @@ workflows: executor: haskell/ghc-8_4_4 - haskell/build: - name: GHC 8.6.3 - executor: haskell/ghc-8_6_3 + name: GHC 8.6.4 + executor: haskell/ghc-8_6_4 - github/release-cabal: name: GitHub Release requires: - GHC 8.2.2 - GHC 8.4.4 - - GHC 8.6.3 + - GHC 8.6.4 checkout: true filters: branches: From 3f1054ed10bb3e639a382bb0646abd0eb16fb33a Mon Sep 17 00:00:00 2001 From: John Ky Date: Tue, 2 Apr 2019 14:37:43 +1100 Subject: [PATCH 2/3] Upgrade cabal --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff47f44..0b17de2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,13 +24,13 @@ matrix: include: - compiler: "ghc-8.6.3" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.6.3], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} - compiler: "ghc-8.4.4" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}} - compiler: "ghc-8.2.2" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}} before_install: - HC=${CC} From 3f210fabbed345ba1fbb05ae02f6b8a41af3d64b Mon Sep 17 00:00:00 2001 From: John Ky Date: Tue, 2 Apr 2019 14:39:11 +1100 Subject: [PATCH 3/3] Upgrade to ghc-8.6.4 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0b17de2..a778b22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,9 @@ before_cache: matrix: include: - - compiler: "ghc-8.6.3" + - compiler: "ghc-8.6.4" # env: TEST=--disable-tests BENCH=--disable-benchmarks - addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}} + addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}} - compiler: "ghc-8.4.4" # env: TEST=--disable-tests BENCH=--disable-benchmarks addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}