From d730ad4ae28a3a224786e53775be5dd31491af19 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 08:27:33 -0500 Subject: [PATCH 1/8] Update to latest LTS --- stack.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack.yaml b/stack.yaml index 6cecc95..fb40d52 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: lts-9.5 +resolver: lts-9.18 flags: yesod-auth-oauth2: network-uri: true From 866a35c348f5d7e1d90a6f0fe93f66d80ff0ab33 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 08:28:09 -0500 Subject: [PATCH 2/8] Install test dependencies in build step This ensures the extra installation doesn't happen in the test step. Also add a missing --pedantic. --- circle.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 05cef82..167112d 100644 --- a/circle.yml +++ b/circle.yml @@ -7,7 +7,10 @@ dependencies: - chmod +x /tmp/stack && sudo mv /tmp/stack /usr/bin/stack override: - stack setup - - stack build --flag yesod-auth-oauth2:example + - stack build + --pedantic + --test --no-run-tests + --flag yesod-auth-oauth2:example test: override: From 5700527e8b974d4b7f0390db5e7b2374b259a74d Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 08:29:06 -0500 Subject: [PATCH 3/8] Use stack-1.6.1 on CI --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 167112d..f5b3d10 100644 --- a/circle.yml +++ b/circle.yml @@ -2,8 +2,8 @@ dependencies: cache_directories: - "~/.stack" pre: - - wget https://github.com/commercialhaskell/stack/releases/download/v1.4.0/stack-1.4.0-linux-x86_64.tar.gz -O /tmp/stack.tar.gz - - tar xvzOf /tmp/stack.tar.gz stack-1.4.0-linux-x86_64/stack > /tmp/stack + - wget https://github.com/commercialhaskell/stack/releases/download/v1.6.1/stack-1.6.1-linux-x86_64.tar.gz -O /tmp/stack.tar.gz + - tar xvzOf /tmp/stack.tar.gz stack-1.6.1-linux-x86_64/stack > /tmp/stack - chmod +x /tmp/stack && sudo mv /tmp/stack /usr/bin/stack override: - stack setup From 7489901ec3c0fe78dfbcc6ac558eabe85f2caf29 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 08:28:28 -0500 Subject: [PATCH 4/8] Check compilation with nightly --- circle.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/circle.yml b/circle.yml index f5b3d10..311692a 100644 --- a/circle.yml +++ b/circle.yml @@ -15,3 +15,8 @@ dependencies: test: override: - stack test + + # Check compilation with nightly. If this proves problematic, add || true + # after to not fail the build. + - stack setup --resolver nightly + - stack build --resolver nightly --pedantic --test --no-run-tests From 7352e36387b479899e455bd8ae5cf552154193c8 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 08:27:55 -0500 Subject: [PATCH 5/8] Run yammlint over stack.yaml and circle.yml --- circle.yml | 1 + stack.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 311692a..9d9fd5a 100644 --- a/circle.yml +++ b/circle.yml @@ -1,3 +1,4 @@ +--- dependencies: cache_directories: - "~/.stack" diff --git a/stack.yaml b/stack.yaml index fb40d52..1b47e39 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,8 +1,9 @@ +--- resolver: lts-9.18 flags: yesod-auth-oauth2: network-uri: true packages: -- . + - . extra-deps: -- load-env-0.1.1 + - load-env-0.1.1 From 22aa05899cf0eabb88b6bd6e086dcb346d0ea279 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 09:25:27 -0500 Subject: [PATCH 6/8] Let's try these shenanigans --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index 9d9fd5a..94c83f2 100644 --- a/circle.yml +++ b/circle.yml @@ -1,4 +1,11 @@ --- +machine: + pre: + # https://github.com/commercialhaskell/stack/issues/1658 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.6 20 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.6 20 + - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 10 + - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.9 10 dependencies: cache_directories: - "~/.stack" From 3632865a0aa807b2289bb93d22b5a92c192cf2c6 Mon Sep 17 00:00:00 2001 From: patrick brisbin Date: Wed, 13 Dec 2017 09:59:59 -0500 Subject: [PATCH 7/8] Relax aeson and hoauth2 upper bounds --- yesod-auth-oauth2.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yesod-auth-oauth2.cabal b/yesod-auth-oauth2.cabal index dd83976..21897e9 100644 --- a/yesod-auth-oauth2.cabal +++ b/yesod-auth-oauth2.cabal @@ -31,7 +31,7 @@ library , http-client >= 0.4.0 && < 0.6 , http-conduit >= 2.0 && < 3.0 , http-types >= 0.8 && < 0.10 - , aeson >= 0.6 && < 1.2 + , aeson >= 0.6 && < 1.3 , yesod-core >= 1.2 && < 1.5 , authenticate >= 1.3.2.7 && < 1.4 , random @@ -39,7 +39,7 @@ library , text >= 0.7 && < 2.0 , yesod-form >= 1.3 && < 1.5 , transformers >= 0.2.2 && < 0.6 - , hoauth2 >= 1.3.0 && < 1.4 + , hoauth2 >= 1.3.0 && < 1.6 , lifted-base >= 0.2 && < 0.4 , vector >= 0.10 && < 0.13 , uri-bytestring From be9572fea9cc328120ac5c9ee0177a6cb4038219 Mon Sep 17 00:00:00 2001 From: Stefan Dresselhaus Date: Wed, 13 Dec 2017 18:18:22 +0100 Subject: [PATCH 8/8] changed upper bounds to compile with ghc8.2 --- yesod-auth-oauth2.cabal | 1 + 1 file changed, 1 insertion(+) diff --git a/yesod-auth-oauth2.cabal b/yesod-auth-oauth2.cabal index 21897e9..93b97a8 100644 --- a/yesod-auth-oauth2.cabal +++ b/yesod-auth-oauth2.cabal @@ -89,6 +89,7 @@ test-suite test , yesod-auth-oauth2 , hspec , uri-bytestring + other-modules: URI.ByteString.ExtensionSpec source-repository head type: git