git.iko.soy/typeable/servant
on master help sign in
Regenerate .travis.yml
commit816b7115f91e602bce062ef2df687438681e5e39 authorOleg Grenrus <oleg.grenrus@iki.fi> dateFri 5 Jan 2018, 10:33 (9 years ago) parentcded17e
3 files changed+46−18
.travis.yml+34−18 cabal.make-travis-yml+8 doc/tutorial/tutorial.cabal+4
.travis.yml+34−18
@@ -1,6 +1,6 @@
11# This Travis job script has been generated by a script via
22#
3−# make_travis_yml_2.hs '-f' '-o' '.travis.yml' '--branch' 'master' '--branch' 'release-0.12' 'cabal.project'
3+# runghc make_travis_yml_2.hs '--config=cabal.make-travis-yml' '--output=.travis.yml' 'cabal.project'
44#
55# For more information, see https://github.com/hvr/multi-ghc-travis
66#
@@ -12,8 +12,8 @@ git:
1212
1313branches:
1414 only:
15− - release-0.12
1615 - master
16+ - release-0.12
1717
1818cache:
1919 directories:
@@ -29,6 +29,8 @@ before_cache:
2929 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
3030 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
3131
32+ - rm -fv $HOME/.cabal/packages/head.hackage
33+
3234matrix:
3335 include:
3436 - compiler: "ghc-7.8.4"
@@ -49,7 +51,10 @@ before_install:
4951 - HCPKG=${HC/ghc/ghc-pkg}
5052 - unset CC
5153 - ROOTDIR=$(pwd)
52− - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH"
54+ - mkdir -p $HOME/.local/bin
55+ - "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
56+ - HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
57+ - echo $HCNUMVER
5358
5459install:
5560 - cabal --version
@@ -58,33 +63,34 @@ install:
5863 - TEST=${TEST---enable-tests}
5964 - HADDOCK=${HADDOCK-true}
6065 - INSTALLED=${INSTALLED-true}
66+ - GHCHEAD=${GHCHEAD-false}
6167 - travis_retry cabal update -v
6268 - "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
63− - rm -fv cabal.project.local
69+ - rm -fv cabal.project cabal.project.local
70+ - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
71+ - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
6472 - if [ -f "servant/configure.ac" ]; then
65− (cd "servant"; autoreconf -i);
73+ (cd "servant" && autoreconf -i);
6674 fi
6775 - if [ -f "servant-client/configure.ac" ]; then
68− (cd "servant-client"; autoreconf -i);
76+ (cd "servant-client" && autoreconf -i);
6977 fi
7078 - if [ -f "servant-client-core/configure.ac" ]; then
71− (cd "servant-client-core"; autoreconf -i);
79+ (cd "servant-client-core" && autoreconf -i);
7280 fi
7381 - if [ -f "servant-docs/configure.ac" ]; then
74− (cd "servant-docs"; autoreconf -i);
82+ (cd "servant-docs" && autoreconf -i);
7583 fi
7684 - if [ -f "servant-foreign/configure.ac" ]; then
77− (cd "servant-foreign"; autoreconf -i);
85+ (cd "servant-foreign" && autoreconf -i);
7886 fi
7987 - if [ -f "servant-server/configure.ac" ]; then
80− (cd "servant-server"; autoreconf -i);
88+ (cd "servant-server" && autoreconf -i);
8189 fi
8290 - if [ -f "doc/tutorial/configure.ac" ]; then
83− (cd "doc/tutorial"; autoreconf -i);
91+ (cd "doc/tutorial" && autoreconf -i);
8492 fi
8593 - rm -f cabal.project.freeze
86− - cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 servant-server servant-client
87− - cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 servant-server servant-client
8894 - rm -rf "servant"/.ghc.environment.* "servant-client"/.ghc.environment.* "servant-client-core"/.ghc.environment.* "servant-docs"/.ghc.environment.* "servant-foreign"/.ghc.environment.* "servant-server"/.ghc.environment.* "doc/tutorial"/.ghc.environment.* "servant"/dist "servant-client"/dist "servant-client-core"/dist "servant-docs"/dist "servant-foreign"/dist "servant-server"/dist "doc/tutorial"/dist
8995 - DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
9096
@@ -106,8 +112,9 @@ script:
106112 - cd ${DISTDIR} || false
107113 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
108114 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal\\n' > cabal.project"
109− # Allow-newer and other cabal.project amendments
110− - "echo 'allow-newer: servant-js:servant, servant-js:servant-foreign' >> cabal.project"
115+ - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
116+ - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"
117+ - cat cabal.project
111118 - echo -en 'travis_fold:end:unpack\\r'
112119 - echo Building... && echo -en 'travis_fold:start:build\\r'
113120 # this builds all libraries and executables (without tests/benchmarks)
@@ -123,15 +130,24 @@ script:
123130 # build & run tests, build benchmarks
124131 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
125132 - echo -en 'travis_fold:end:build-everything\\r'
126− - echo Testing... && echo -en 'travis_fold:start:test\\r'
127133 - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
128− - echo -en 'travis_fold:end:test\\r'
129134
135+ - echo cabal check... && echo -en 'travis_fold:start:check\\r'
136+ # cabal check
137+ - (cd servant-* && cabal check)
138+ - (cd servant-client-* && cabal check)
139+ - (cd servant-client-core-* && cabal check)
140+ - (cd servant-docs-* && cabal check)
141+ - (cd servant-foreign-* && cabal check)
142+ - (cd servant-server-* && cabal check)
143+ - (cd tutorial-* && cabal check)
144+
145+ - echo -en 'travis_fold:end:check\\r'
130146 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
131147 # haddock
132148 - rm -rf ./dist-newstyle
133149 - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
134150
135151 - echo -en 'travis_fold:end:haddock\\r'
136−# REGENDATA ["-f","-o",".travis.yml","--branch","master","--branch","release-0.12","cabal.project"]
152+# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
137153# EOF
cabal.make-travis-ymlnew file+8
@@ -0,0 +1,8 @@
1+folds: all-but-test
2+branches: master release-0.12
3+
4+-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
5+install-dependencies-step: False
6+
7+-- ghc-options: -j2
8+jobs: :2
doc/tutorial/tutorial.cabal+4
@@ -1,7 +1,11 @@
11name: tutorial
22version: 0.10
33synopsis: The servant tutorial
4+description:
5+ The servant tutorial can be found at
6+ <http://haskell-servant.readthedocs.org/>
47homepage: http://haskell-servant.readthedocs.org/
8+category: Servant, Documentation
59license: BSD3
610license-file: LICENSE
711author: Servant Contributors