git.iko.soy/typeable/servant
on master help sign in
Fix .travis.yml
commit626762df7edc5cc2d6e5c4e2350effeac7e9fb9f authorOleg Grenrus <oleg.grenrus@iki.fi> dateTue 12 Jun 2018, 19:29 (8 years ago) parent6a1fa67
2 files changed+3−4
compare with master
unifiedsplit
.travis.yml+2−3 cabal.make-travis-yml+1−1
.travis.yml+2−3
@@ -13,7 +13,6 @@ git:
1313branches:
1414 only:
1515 - master
16− - release-0.12
1716
1817cache:
1918 directories:
@@ -74,7 +73,7 @@ install:
7473 - grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7574 - "printf 'packages: \"servant\" \"servant-client\" \"servant-client-core\" \"servant-docs\" \"servant-foreign\" \"servant-server\" \"doc/tutorial\" \"doc/cookbook/basic-auth\" \"doc/cookbook/db-postgres-pool\" \"doc/cookbook/db-sqlite-simple\" \"doc/cookbook/https\" \"doc/cookbook/pagination\" \"doc/cookbook/structuring-apis\" \"doc/cookbook/using-custom-monad\"\\n' > cabal.project"
7675 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
77− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
76+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base, servant-js:servant,servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
7877 - cat cabal.project
7978 - if [ -f "servant/configure.ac" ]; then
8079 (cd "servant" && autoreconf -i);
@@ -148,7 +147,7 @@ script:
148147 - find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
149148 - "printf 'packages: servant-*/*.cabal servant-client-*/*.cabal servant-client-core-*/*.cabal servant-docs-*/*.cabal servant-foreign-*/*.cabal servant-server-*/*.cabal tutorial-*/*.cabal cookbook-basic-auth-*/*.cabal cookbook-db-postgres-pool-*/*.cabal cookbook-db-sqlite-simple-*/*.cabal cookbook-https-*/*.cabal cookbook-pagination-*/*.cabal cookbook-structuring-apis-*/*.cabal cookbook-using-custom-monad-*/*.cabal\\n' > cabal.project"
150149 - "echo 'constraints: foundation >=0.0.14,memory <0.14.12 || >0.14.12' >> cabal.project"
151− - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base' >> cabal.project"
150+ - "echo 'allow-newer: servant-auth-server:http-types,servant-auth-server:servant-server, http-media:base, servant-js:servant,servant-pagination:servant,servant-pagination:servant-server' >> cabal.project"
152151 - cat cabal.project
153152 - echo -en 'travis_fold:end:unpack\\r'
154153
cabal.make-travis-yml+1−1
@@ -1,5 +1,5 @@
11folds: all-but-test
2−branches: master release-0.12
2+branches: master
33
44-- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
55install-dependencies-step: False