on master help sign in
Merge pull request #1197 from david-christiansen/travisdoc

Make Travis run "make doc" as part of tests

commitbddcb569646d317c2c99dee213b0966cddca35cd authorDavid Christiansen <david@davidchristiansen.dk> dateMon 5 May 2014, 15:09 (12 years ago) parent3ef9556fc0c55c
2 files changed+9−7
.travis.yml+8−6 Makefile+1−1
.travis.yml+8−6
@@ -6,6 +6,8 @@ before_install:
66 - sudo apt-get install -qq libghc-unordered-containers-dev libghc-mtl-dev libghc-network-dev libghc-xml-dev libghc-transformers-dev libghc-text-dev libghc-utf8-string-dev libghc-vector-dev libghc-split-dev libghc-ansi-terminal-dev libghc-ansi-wl-pprint-dev
77 # trifecta dependencies
88 - sudo apt-get install -qq libghc-blaze-builder-dev libghc-blaze-html-dev libghc-data-lens-dev libghc-bifunctors-dev libghc-hashable-dev libghc-semigroups-dev libghc-semigroupoids-dev libghc-parallel-dev libghc-comonad-dev libghc-terminfo-dev libghc-keys-dev
9+ # Haddock dependencies
10+ - sudo apt-get install hscolour
911 # test dependency
1012 - sudo apt-get install -qq expect
1113install:
@@ -17,11 +19,11 @@ before_script:
1719 - cd idris*
1820script:
1921 - cabal configure -f FFI -f LLVM
20− - cabal build
21− - cabal copy
22+ - if [[ "$TESTS" != "doc" ]]; then cabal build; fi
23+ - if [[ "$TESTS" != "doc" ]]; then cabal copy; fi
2224 - make -j2 $TESTS
2325env:
24− # TESTS=doc
25− - TESTS=test_c
26− - TESTS=test_llvm
27− - TESTS=test_js
26+ - TESTS="doc"
27+ - TESTS="test_c"
28+ - TESTS="test_llvm"
29+ - TESTS="test_js"
Makefile+1−1
@@ -43,7 +43,7 @@ linecount:
4343
4444#Note: this doesn't yet link to Hackage properly
4545doc: dist/setup-config
46− $(CABAL) haddock --executables --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"
46+ $(CABAL) haddock --hyperlink-source --html --hoogle --html-location="http://hackage.haskell.org/packages/archive/\$$pkg/latest/doc/html" --haddock-options="--title Idris"
4747
4848
4949dist/setup-config: