git.iko.soy/typeable/servant
on master help sign in
Fix travis, disallow memory-0.14.12

Also remove duplicate bug-reports field

commit3c7e7775fe025336cc7a416556db728354a8dc50 authorOleg Grenrus <oleg.grenrus@iki.fi> dateWed 17 Jan 2018, 18:53 (9 years ago) parent2dc48f0
4 files changed+31−6
compare with master
unifiedsplit
.travis.yml+8−4 README.md+20 cabal.project+2−1 servant-server/servant-server.cabal+1−1
.travis.yml+8−4
@@ -29,7 +29,7 @@ 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
32+ - rm -rfv $HOME/.cabal/packages/head.hackage
3333
3434matrix:
3535 include:
@@ -69,6 +69,10 @@ install:
6969 - rm -fv cabal.project cabal.project.local
7070 - "if [ $HCNUMVER -ge 70800 ]; then sed -i.bak 's/-- ghc-options:.*/ghc-options: -j2/' ${HOME}/.cabal/config; fi"
7171 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
72+ - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\"\\n' > cabal.project"
73+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
74+ - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"
75+ - cat cabal.project
7276 - if [ -f "servant/configure.ac" ]; then
7377 (cd "servant" && autoreconf -i);
7478 fi
@@ -112,7 +116,7 @@ script:
112116 - cd ${DISTDIR} || false
113117 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
114118 - "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"
115− - "echo 'constraints: foundation >=0.0.14' >> cabal.project"
119+ - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
116120 - "echo 'allow-newer: servant-js:servant-foreign' >> cabal.project"
117121 - cat cabal.project
118122 - echo -en 'travis_fold:end:unpack\\r'
@@ -130,7 +134,7 @@ script:
130134 # build & run tests, build benchmarks
131135 - cabal new-build -w ${HC} ${TEST} ${BENCH} all
132136 - echo -en 'travis_fold:end:build-everything\\r'
133− - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} all; fi
137+ - if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
134138
135139 - echo cabal check... && echo -en 'travis_fold:start:check\\r'
136140 # cabal check
@@ -146,7 +150,7 @@ script:
146150 - echo Haddock... && echo -en 'travis_fold:start:haddock\\r'
147151 # haddock
148152 - rm -rf ./dist-newstyle
149− - if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
153+ - if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
150154
151155 - echo -en 'travis_fold:end:haddock\\r'
152156# REGENDATA ["--config=cabal.make-travis-yml","--output=.travis.yml","cabal.project"]
README.md+20
@@ -58,3 +58,23 @@ See `CONTRIBUTING.md`
5858 - `git tag -s` the release
5959 - `git push --tags`
6060 - `cabal sdist` and `cabal upload`
61+
62+## travis
63+
64+`.travis.yml` is generated using `make-travis-yml` tool, in
65+[multi-ghc-travis](https://github.com/haskell-hvr/multi-ghc-travis) repository.
66+
67+To regenerate the script use (*note:* atm you need to comment `doc/cookbook/` packages).
68+
69+```
70+runghc ~/Documents/other-haskell/multi-ghc-travis/make_travis_yml_2.hs regenerate
71+```
72+
73+In case Travis jobs fail due failing build of dependency, you can temporarily
74+add `constraints` to the `cabal.project`, and regenerate the `.travis.yml`.
75+For example, the following will disallow single `troublemaker-13.37` package version:
76+
77+```
78+constraints:
79+ troublemaker <13.37 && > 13.37
80+```
cabal.project+2−1
@@ -18,4 +18,5 @@ allow-newer: servant-js:servant-foreign
1818
1919constraints:
2020 -- see https://github.com/haskell-infra/hackage-trustees/issues/119
21− foundation >=0.0.14
21+ foundation >=0.0.14,
22+ memory <0.14.2 && >0.14.2
servant-server/servant-server.cabal+1−1
@@ -30,7 +30,7 @@ extra-source-files:
3030 include/*.h
3131 CHANGELOG.md
3232 README.md
33−bug-reports: http://github.com/haskell-servant/servant/issues
33+
3434source-repository head
3535 type: git
3636 location: http://github.com/haskell-servant/servant.git