From f56ca406f4ed0e5a060ba47013df0515072d3792 Mon Sep 17 00:00:00 2001 From: Alexey Raga Date: Tue, 23 Nov 2021 10:11:30 +1100 Subject: [PATCH 1/3] Compile with GHC-8.10.7 --- .circleci/config.yml | 29 ++++++++--------------------- antiope-es/antiope-es.cabal | 1 - 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6bebfef..a860b43 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,19 +6,17 @@ orbs: hackage: haskell-works/hackage@1.4.2 merge-point: haskell-works/merge-point@1.0.0 +executors: + ghc-8_10_7: + docker: + - image: quay.io/haskell_works/ghc-8.10.7:ubuntu-18.04 + workflows: multiple-ghc-build: jobs: - haskell/build-with-binary-cache: - name: GHC 8.4.4 - executor: haskell/ghc-8_4_4 - context: haskell-ci - binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"} - build-components: all - - - haskell/build-with-binary-cache: - name: GHC 8.6.5 - executor: haskell/ghc-8_6_5 + name: GHC 8.10.7 + executor: ghc-8_10_7 context: haskell-ci binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"} build-components: all @@ -32,21 +30,10 @@ workflows: build-dependencies-first: true build-components-separately: true - - haskell/build-with-binary-cache: - name: GHC 8.8.2 - executor: haskell/ghc-8_8_2 - context: haskell-ci - binary-cache-uri: ${BINARY_CACHE_URI-"http://hw-binary-cache-us-west-2-a.s3-website-us-west-2.amazonaws.com/archive"} - build-components: antiope-athena antiope-contract antiope-core antiope-dynamodb antiope-es antiope-messages antiope-optparse-applicative antiope-s3 antiope-shell antiope-sns antiope-sqs - build-dependencies-first: true - build-components-separately: true - - merge-point/merge-point: name: Build Ok requires: - - GHC 8.4.4 - - GHC 8.6.5 - - GHC 8.8.2 + - GHC 8.10.7 - GHC 8.8.3 - github/release-cabal: diff --git a/antiope-es/antiope-es.cabal b/antiope-es/antiope-es.cabal index e601e27..e372e55 100644 --- a/antiope-es/antiope-es.cabal +++ b/antiope-es/antiope-es.cabal @@ -40,7 +40,6 @@ library , bytestring , json-stream , lens - , thyme , unordered-containers , vector From 4c57188162c4a7be7b54e30fc7674efbb5e4be02 Mon Sep 17 00:00:00 2001 From: Alexey Raga Date: Tue, 23 Nov 2021 10:23:04 +1100 Subject: [PATCH 2/3] Allow region discovery --- antiope-core/src/Antiope/Env.hs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/antiope-core/src/Antiope/Env.hs b/antiope-core/src/Antiope/Env.hs index d3fb8db..91fece2 100644 --- a/antiope-core/src/Antiope/Env.hs +++ b/antiope-core/src/Antiope/Env.hs @@ -1,6 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} module Antiope.Env ( mkEnv + , mkEnv' , AWS.Env , AWS.HasEnv(..) , AWS.LogLevel(..) @@ -17,14 +18,18 @@ import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy.Internal as LBS import qualified Network.AWS as AWS -mkEnv :: Region -> (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env -mkEnv region lg = do +-- | A version of mkEnv that is allowed to discover the region. +mkEnv' :: (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env +mkEnv' lg = do lgr <- newAwsLogger lg newEnv Discover <&> envLogger .~ lgr - <&> envRegion .~ region <&> envRetryCheck .~ retryPolicy 5 +mkEnv :: Region -> (AWS.LogLevel -> LBS.ByteString -> IO ()) -> IO AWS.Env +mkEnv region lg = + mkEnv' lg <&> envRegion .~ region + newAwsLogger :: Monad m => (AWS.LogLevel -> LBS.ByteString -> IO ()) -> m AWS.Logger newAwsLogger lg = return $ \y b -> let lazyMsg = toLazyByteString b From 0dd32ddd34f9090d4740af0953cf5b1b7539a516 Mon Sep 17 00:00:00 2001 From: Alexey Raga Date: Tue, 23 Nov 2021 10:23:49 +1100 Subject: [PATCH 3/3] Bump version --- antiope-athena/antiope-athena.cabal | 2 +- antiope-contract/antiope-contract.cabal | 2 +- antiope-core/antiope-core.cabal | 2 +- antiope-dynamodb/antiope-dynamodb.cabal | 2 +- antiope-es/antiope-es.cabal | 2 +- antiope-messages/antiope-messages.cabal | 2 +- antiope-optparse-applicative/antiope-optparse-applicative.cabal | 2 +- antiope-s3/antiope-s3.cabal | 2 +- antiope-shell/antiope-shell.cabal | 2 +- antiope-sns/antiope-sns.cabal | 2 +- antiope-sqs/antiope-sqs.cabal | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/antiope-athena/antiope-athena.cabal b/antiope-athena/antiope-athena.cabal index 71961b6..df980d4 100644 --- a/antiope-athena/antiope-athena.cabal +++ b/antiope-athena/antiope-athena.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-athena -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-contract/antiope-contract.cabal b/antiope-contract/antiope-contract.cabal index a626ba6..189368e 100644 --- a/antiope-contract/antiope-contract.cabal +++ b/antiope-contract/antiope-contract.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-contract -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-core/antiope-core.cabal b/antiope-core/antiope-core.cabal index b0caa6f..d1a9a1b 100644 --- a/antiope-core/antiope-core.cabal +++ b/antiope-core/antiope-core.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-core -version: 7.5.3 +version: 7.5.4 description: Please see the README on Github at . synopsis: Please see the README on Github at category: Services diff --git a/antiope-dynamodb/antiope-dynamodb.cabal b/antiope-dynamodb/antiope-dynamodb.cabal index a217572..8eca410 100644 --- a/antiope-dynamodb/antiope-dynamodb.cabal +++ b/antiope-dynamodb/antiope-dynamodb.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-dynamodb -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-es/antiope-es.cabal b/antiope-es/antiope-es.cabal index e372e55..fc5b3eb 100644 --- a/antiope-es/antiope-es.cabal +++ b/antiope-es/antiope-es.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-es -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-messages/antiope-messages.cabal b/antiope-messages/antiope-messages.cabal index ca860f6..6468e28 100644 --- a/antiope-messages/antiope-messages.cabal +++ b/antiope-messages/antiope-messages.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-messages -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-optparse-applicative/antiope-optparse-applicative.cabal b/antiope-optparse-applicative/antiope-optparse-applicative.cabal index c533d08..257e8be 100644 --- a/antiope-optparse-applicative/antiope-optparse-applicative.cabal +++ b/antiope-optparse-applicative/antiope-optparse-applicative.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-optparse-applicative -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-s3/antiope-s3.cabal b/antiope-s3/antiope-s3.cabal index 239a382..e5f9198 100644 --- a/antiope-s3/antiope-s3.cabal +++ b/antiope-s3/antiope-s3.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-s3 -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-shell/antiope-shell.cabal b/antiope-shell/antiope-shell.cabal index 63eba06..77f2d6e 100644 --- a/antiope-shell/antiope-shell.cabal +++ b/antiope-shell/antiope-shell.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-shell -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-sns/antiope-sns.cabal b/antiope-sns/antiope-sns.cabal index 00572c2..a75f538 100644 --- a/antiope-sns/antiope-sns.cabal +++ b/antiope-sns/antiope-sns.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-sns -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services diff --git a/antiope-sqs/antiope-sqs.cabal b/antiope-sqs/antiope-sqs.cabal index 9779fcc..957da89 100644 --- a/antiope-sqs/antiope-sqs.cabal +++ b/antiope-sqs/antiope-sqs.cabal @@ -1,7 +1,7 @@ cabal-version: 2.4 name: antiope-sqs -version: 7.5.3 +version: 7.5.4 synopsis: Please see the README on Github at description: Please see the README on Github at . category: Services