git.iko.soy/project-m36
on master help sign in
add haddock and hlint steps but only on Linux

add workaround which may prevent the cache from functioning

commit8f2de49a0a48c80d05a0620fd9ca2d5c64cbec30 authorAgentM <agentm@themactionfaction.com> dateSun 7 Jan 2018, 01:53 (9 years ago) parentad1973c
2 files changed+15−11
compare with master
unifiedsplit
.travis.yml+14−10 test/Relation/StaticOptimizer.hs+1−1
.travis.yml+14−10
@@ -23,16 +23,11 @@ matrix:
2323 compiler: ": #stack 8.0.2"
2424 addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
2525
26− - env: CACHE_NAME=osx-7.10.3 STACK_YAML=stack.ghc7.10.yaml
27− os: osx
28− osx_image: xcode6.4
29− compiler: ": #stack 7.10.3"
30−
3126 - env: CACHE_NAME=osx-8.0.2 STACK_YAML=stack.yaml
3227 os: osx
3328 compiler: ": #stack 8.0.2"
3429
35−install:
30+before_script:
3631 - unset CC
3732 - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
3833 - ./.travis/install-ghr.sh
@@ -44,12 +39,21 @@ install:
4439script:
4540 - |
4641 # Run tests
47− if [ "$(uname)" = "Darwin" ]; then
48− stack --no-install-ghc --no-terminal test
49− else
42+ if [[ "$(uname)" = "Linux" ]]; then
43+ stack --no-install-ghc --no-terminal --system-ghc test
44+ else #Darwin
5045 stack --no-install-ghc --system-ghc --no-terminal test
5146 fi
52−
47+ - |
48+ #Run HLint
49+ if [[ "$(uname)" = "Linux" ]]; then
50+ curl -sL https://raw.github.com/ndmitchell/hlint/master/misc/travis.sh | sh -s lint src test examples --cpp-define VERSION_project_m36=HLINT
51+ fi
52+ - |
53+ #Run Haddock
54+ if [[ "$(uname)" = "Linux" ]]; then
55+ stack --no-install-ghc --system-ghc --no-haddock-deps haddock
56+ fi
5357
5458after_success:
5559 - |
test/Relation/StaticOptimizer.hs+1−1
@@ -130,7 +130,7 @@ testPushDownRestrictionPredicate = TestCase $ do
130130 Right rel -> pure rel
131131
132132 expectedExpr1 = Union (Restrict status30 rvs) (Restrict status30 (ExistingRelation stevens))
133− pure $ (expectedExpr1, (applyStaticRestrictionPushdown expr1))
133+ pure (expectedExpr1, applyStaticRestrictionPushdown expr1)
134134 either (assertFailure . (++) "stevens relation: " . show) (uncurry $ assertEqual "union restriction pushdown") relationsOrError
135135
136136 -- s{sname,city} where city="London" == (s where city="London"){sname,city}