git.iko.soy/project-m36
on master help sign in
add haddock and hlint steps but only on Linux
8f2de49AgentM
.travis.yml+14−10
compare with master
unifiedsplit
@@ -23,16 +23,11 @@ matrix:
23 compiler: ": #stack 8.0.2"
23 compiler: ": #stack 8.0.2"
24 addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
24 addons: {apt: {packages: [ghc-8.0.2], sources: [hvr-ghc]}}
25
25
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−
31 - env: CACHE_NAME=osx-8.0.2 STACK_YAML=stack.yaml
26 - env: CACHE_NAME=osx-8.0.2 STACK_YAML=stack.yaml
32 os: osx
27 os: osx
33 compiler: ": #stack 8.0.2"
28 compiler: ": #stack 8.0.2"
34
29
35−install:
30+before_script:
36 - unset CC
31 - unset CC
37 - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
32 - export PATH=$HOME/.local/bin:/opt/ghc/$GHC_VERSION/bin:$PATH
38 - ./.travis/install-ghr.sh
33 - ./.travis/install-ghr.sh
@@ -44,12 +39,21 @@ install:
44script:
39script:
45 - |
40 - |
46 # Run tests
41 # Run tests
47− if [ "$(uname)" = "Darwin" ]; then
42+ if [[ "$(uname)" = "Linux" ]]; then
48− stack --no-install-ghc --no-terminal test
43+ stack --no-install-ghc --no-terminal --system-ghc test
49− else
44+ else #Darwin
50 stack --no-install-ghc --system-ghc --no-terminal test
45 stack --no-install-ghc --system-ghc --no-terminal test
51 fi
46 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
53
57
54after_success:
58after_success:
55 - |
59 - |
test/Relation/StaticOptimizer.hs+1−1
@@ -130,7 +130,7 @@ testPushDownRestrictionPredicate = TestCase $ do
130 Right rel -> pure rel
130 Right rel -> pure rel
131
131
132 expectedExpr1 = Union (Restrict status30 rvs) (Restrict status30 (ExistingRelation stevens))
132 expectedExpr1 = Union (Restrict status30 rvs) (Restrict status30 (ExistingRelation stevens))
133− pure $ (expectedExpr1, (applyStaticRestrictionPushdown expr1))
133+ pure (expectedExpr1, applyStaticRestrictionPushdown expr1)
134 either (assertFailure . (++) "stevens relation: " . show) (uncurry $ assertEqual "union restriction pushdown") relationsOrError
134 either (assertFailure . (++) "stevens relation: " . show) (uncurry $ assertEqual "union restriction pushdown") relationsOrError
135
135
136 -- s{sname,city} where city="London" == (s where city="London"){sname,city}
136 -- s{sname,city} where city="London" == (s where city="London"){sname,city}