eeva/servant
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1245 from haskell-servant/small-updates

Browse Source 
Small updates
This commit is contained in:
Oleg Grenrus 2019-11-18 00:57:42 +02:00 committed by GitHub
commit 971d14032a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.travis.yml
View File

@ -7,7 +7,7 @@
# version: 0.7.20191106 # version: 0.7.20191106
# #
language: c language: c
dist: xenial dist: bionic
git: git:
# whether to recursively clone submodules # whether to recursively clone submodules
submodules: false submodules: false
@ -33,17 +33,17 @@ before_cache:
matrix: matrix:
include: include:
- compiler: ghcjs-8.4 - compiler: ghcjs-8.4
addons: {"apt":{"sources":["hvr-ghc",{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu xenial main"},{"sourceline":"deb https://deb.nodesource.com/node_8.x xenial main","key_url":"https://deb.nodesource.com/gpgkey/nodesource.gpg.key"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"},{"sourceline":"deb http://ppa.launchpad.net/hvr/ghcjs/ubuntu bionic main"}],"packages":["ghcjs-8.4","cabal-install-3.0","ghc-8.4.4","nodejs"]}}
- compiler: ghc-8.8.1 - compiler: ghc-8.8.1
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.8.1","cabal-install-3.0"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
- compiler: ghc-8.6.5 - compiler: ghc-8.6.5
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.6.5","cabal-install-3.0"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
- compiler: ghc-8.4.4 - compiler: ghc-8.4.4
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.4.4","cabal-install-3.0"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
- compiler: ghc-8.2.2 - compiler: ghc-8.2.2
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.2.2","cabal-install-3.0"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
- compiler: ghc-8.0.2 - compiler: ghc-8.0.2
addons: {"apt":{"sources":["hvr-ghc"],"packages":["ghc-8.0.2","cabal-install-3.0"]}} addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu bionic main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
before_install: before_install:
- | - |
if echo $CC | grep -q ghcjs; then if echo $CC | grep -q ghcjs; then

1
cabal.haskell-ci
View File

@ -1,3 +1,4 @@
distribution: bionic
folds: all-but-test folds: all-but-test
branches: master branches: master
jobs-selection: any jobs-selection: any

2
doc/tutorial/tutorial.cabal
View File

@ -66,7 +66,7 @@ library
blaze-html >= 0.9.0.1 && < 0.10 blaze-html >= 0.9.0.1 && < 0.10
, blaze-markup >= 0.8.0.0 && < 0.9 , blaze-markup >= 0.8.0.0 && < 0.9
, cookie >= 0.4.3 && < 0.5 , cookie >= 0.4.3 && < 0.5
, js-jquery >= 3.2.1 && < 3.3 , js-jquery >= 3.3.1 && < 3.4
, lucid >= 2.9.11 && < 2.10 , lucid >= 2.9.11 && < 2.10
, random >= 1.1 && < 1.2 , random >= 1.1 && < 1.2
, servant-js >= 0.9 && < 0.10 , servant-js >= 0.9 && < 0.10

2
servant-jsaddle/servant-jsaddle.cabal
View File

@ -122,4 +122,4 @@ test-suite spec
, jsaddle-warp , jsaddle-warp
, QuickCheck , QuickCheck
build-tool-depends: hspec-discover:hspec-discover >=2.4.4 && <2.5 build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8