From 86a7f954e3dca75df9eb33d6a4359fb49825dd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Fri, 27 Jun 2014 19:31:34 +0200 Subject: [PATCH 1/3] Add a comment discouraging the use of `toGhcMod` in new code --- Language/Haskell/GhcMod/Monad.hs | 1 + 1 file changed, 1 insertion(+) diff --git a/Language/Haskell/GhcMod/Monad.hs b/Language/Haskell/GhcMod/Monad.hs index 7457d72..5df48c4 100644 --- a/Language/Haskell/GhcMod/Monad.hs +++ b/Language/Haskell/GhcMod/Monad.hs @@ -124,6 +124,7 @@ withErrorHandler label = ghandle ignore hPrint stderr e exitSuccess +-- | This is only a transitional mechanism don't use it for new code. toGhcMod :: Ghc a -> GhcMod a toGhcMod a = do s <- gmGhcSession <$> ask From c5776c220b2cf68a497a7479e112161b21b6da84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Wed, 2 Jul 2014 19:19:36 +0200 Subject: [PATCH 2/3] Update .travis.yml - Travis-ci now supports testing multiple ghc versions out of the box. - Don't bother running the tests in tree and go straight to testing from the tarball realease --- .travis.yml | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index d6da67d..e80d0e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,33 +1,25 @@ -env: - - GHCVER=7.4.2 - - GHCVER=7.6.3 - - GHCVER=7.8.2 - -before_install: - - sudo add-apt-repository -y ppa:hvr/ghc - - sudo apt-get update - - sudo apt-get install cabal-install-1.18 ghc-$GHCVER happy-1.19.3 - - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.18/bin:/opt/happy/1.19.3/bin:$PATH +language: haskell +ghc: + - 7.4 + - 7.6 + - 7.8 install: - cabal update - - cabal install --only-dependencies --enable-tests + - cabal install happy + - happy --version + - cabal install -j --only-dependencies --enable-tests script: + - cabal check + - cabal sdist + - export SRC_TGZ="$PWD/dist/$(cabal info . | awk '{print $2 ".tar.gz";exit}')" + - rm -rf /tmp/test && mkdir -p /tmp/test + - cd /tmp/test + - tar -xf $SRC_TGZ && cd ghc-mod*/ - cabal configure --enable-tests - cabal build - cabal test - - cabal check - - cabal sdist - # The following scriptlet checks that the resulting source distribution can be built & installed - - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}'); - cd dist/; - if [ -f "$SRC_TGZ" ]; then - cabal install --enable-tests "$SRC_TGZ"; - else - echo "expected '$SRC_TGZ' not found"; - exit 1; - fi matrix: allow_failures: From efb91a8bd9050c5b1a0e767a1c11c4c9363d4acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Fri, 4 Jul 2014 19:00:38 +0200 Subject: [PATCH 3/3] Add workaround for #277 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e80d0e7..10905cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ ghc: install: - cabal update - - cabal install happy + - cabal install happy --constraint 'transformers <= 0.3.0.0' - happy --version - cabal install -j --only-dependencies --enable-tests