diff --git a/.hlint.yaml b/.hlint.yaml index a2649bbf..907994e5 100644 --- a/.hlint.yaml +++ b/.hlint.yaml @@ -41,3 +41,9 @@ - ignore: {name: Reduce duplication, within: Integration.MultiThreaded} - ignore: {name: Reduce duplication, within: Integration.SCT} - ignore: {name: Reduce duplication, within: Integration.SingleThreaded} + +# These are tests of the laws +- ignore: {name: "Use <$>", within: Examples.ClassLaws} +- ignore: {name: "Alternative law, right identity", within: Examples.ClassLaws} +- ignore: {name: "Alternative law, left identity", within: Examples.ClassLaws} +- ignore: {name: "Monoid law, right identity", within: Unit.Properties} diff --git a/.travis.yml b/.travis.yml index dec8dcda..0f33236b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,16 +39,16 @@ jobs: env: MODE=lint - stage: test if: type != pull_request - env: MODE=test RESOLVER=lts-9.0 # GHC 8.0 + env: MODE=test RESOLVER=lts-9.0 STACKVER=1.6.1 # GHC 8.0 - stage: test if: type != pull_request - env: MODE=test RESOLVER=lts-10.0 # GHC 8.2 + env: MODE=test RESOLVER=lts-10.0 STACKVER=1.6.1 # GHC 8.2 - stage: test if: type != pull_request - env: MODE=test RESOLVER=lts-12.0 # GHC 8.4 + env: MODE=test RESOLVER=lts-12.0 STACKVER=1.7.1 # GHC 8.4 - stage: test if: type != pull_request - env: MODE=test RESOLVER=lts-13.3 # GHC 8.6 - .3 because hedgehog and stylish-haskell aren't in .0 + env: MODE=test RESOLVER=lts-13.3 STACKVER=1.9.3 # GHC 8.6 - .3 because hedgehog and stylish-haskell aren't in .0 - stage: test if: type != pull_request env: MODE=test RESOLVER=nightly diff --git a/.travis/lint b/.travis/lint index 5ddd6bf2..d18f9a55 100755 --- a/.travis/lint +++ b/.travis/lint @@ -6,7 +6,7 @@ $stack install stylish-haskell $stack build -curl -sL https://raw.github.com/ndmitchell/weeder/master/misc/travis.sh | sh -s . +#curl -sL https://raw.github.com/ndmitchell/weeder/master/misc/travis.sh | sh -s . curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s . $stack exec ./style.sh diff --git a/.travis/setup.sh b/.travis/setup.sh index 2b366d05..1cece564 100644 --- a/.travis/setup.sh +++ b/.travis/setup.sh @@ -8,8 +8,13 @@ stack="stack --no-terminal" mkdir -p ~/.local/bin -curl -L https://www.stackage.org/stack/linux-x86_64 | \ - tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' +if [[ -z "$STACKVER" ]]; then + curl -L https://www.stackage.org/stack/linux-x86_64 | \ + tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' +else + curl -L https://github.com/commercialhaskell/stack/releases/download/v$STACKVER/stack-$STACKVER-linux-x86_64.tar.gz | \ + tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack' +fi if [[ -e ".travis/$RESOLVER.yaml" ]]; then mv ".travis/$RESOLVER.yaml" stack.yaml diff --git a/.travis/test b/.travis/test index 48e1b8a0..20051430 100755 --- a/.travis/test +++ b/.travis/test @@ -2,7 +2,7 @@ source .travis/setup.sh -$stack build --ghc-options=-Werror +$stack build --ghc-options="-Werror -Wno-unused-imports" cd dejafu-tests $stack exec -- dejafu-tests +RTS -s