Skip to content

Commit e213138

Browse files
phadejphadej
authored
Merge pull request #30 from haskell-servant/ghc-8.6
Support GHC-8.6
2 parents 46ff335 + c30f242 commit e213138

File tree

2 files changed

+27
-16
lines changed

2 files changed

+27
-16
lines changed

‎.travis.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' '--config' 'servant-js.cabal'
44
#
5-
# For more information, see https://github.com/hvr/multi-ghc-travis
5+
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
77
language: c
88
sudo: false
@@ -32,21 +32,24 @@ before_cache:
3232

3333
matrix:
3434
include:
35-
- compiler: "ghc-8.4.3"
35+
- compiler: "ghc-8.6.1"
3636
# env: TEST=--disable-tests BENCH=--disable-benchmarks
37-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}
37+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
38+
- compiler: "ghc-8.4.4"
39+
# env: TEST=--disable-tests BENCH=--disable-benchmarks
40+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
3841
- compiler: "ghc-8.2.2"
3942
# env: TEST=--disable-tests BENCH=--disable-benchmarks
40-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.2.2], sources: [hvr-ghc]}}
43+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4144
- compiler: "ghc-8.0.2"
4245
# env: TEST=--disable-tests BENCH=--disable-benchmarks
43-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-8.0.2], sources: [hvr-ghc]}}
46+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4447
- compiler: "ghc-7.10.3"
4548
# env: TEST=--disable-tests BENCH=--disable-benchmarks
46-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.10.3], sources: [hvr-ghc]}}
49+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.10.3], sources: [hvr-ghc]}}
4750
- compiler: "ghc-7.8.4"
4851
# env: TEST=--disable-tests BENCH=--disable-benchmarks
49-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.2,ghc-7.8.4], sources: [hvr-ghc]}}
52+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-7.8.4], sources: [hvr-ghc]}}
5053

5154
before_install:
5255
- HC=${CC}
@@ -73,7 +76,7 @@ install:
7376
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
7477
- "printf 'packages: \".\"\\n' > cabal.project"
7578
- touch cabal.project.local
76-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
79+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-js | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
7780
- cat cabal.project || true
7881
- cat cabal.project.local || true
7982
- if [ -f "./configure.ac" ]; then
@@ -89,13 +92,13 @@ install:
8992
# any command which exits with a non-zero exit code causes the build to fail.
9093
script:
9194
# test that source-distributions can be generated
92-
- (cd "." && cabal sdist)
93-
- mv "."/dist/servant-js-*.tar.gz ${DISTDIR}/
95+
- cabal new-sdist all
96+
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
9497
- cd ${DISTDIR} || false
9598
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
9699
- "printf 'packages: servant-js-*/*.cabal\\n' > cabal.project"
97100
- touch cabal.project.local
98-
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
101+
- "if ! $NOINSTALLEDCONSTRAINTS; then for pkg in $($HCPKG list --simple-output); do echo $pkg | grep -vw -- servant-js | sed 's/^/constraints: /' | sed 's/-[^-]*$/ installed/' >> cabal.project.local; done; fi"
99102
- cat cabal.project || true
100103
- cat cabal.project.local || true
101104
# this builds all libraries and executables (without tests/benchmarks)
@@ -109,7 +112,6 @@ script:
109112
- (cd servant-js-* && cabal check)
110113

111114
# haddock
112-
- rm -rf ./dist-newstyle
113115
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
114116

115117
# Build without installed constraints for packages in global-db

‎servant-js.cabal‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
name: servant-js
22
version: 0.9.3.2
3-
x-revision: 2
3+
x-revision: 3
4+
45
synopsis: Automatically derive javascript functions to query servant webservices.
6+
category: Web, Servant
57
description:
68
Automatically derive javascript functions to query servant webservices.
79
.
@@ -12,17 +14,24 @@ description:
1214
webservice calls.
1315
.
1416
<https://github.com/haskell-servant/servant-js/blob/master/CHANGELOG.md CHANGELOG>
17+
1518
license: BSD3
1619
license-file: LICENSE
1720
author: Servant Contributors
1821
maintainer: [email protected]
1922
copyright: 2015-2016 Servant Contributors
20-
category: Web, Servant
2123
build-type: Simple
2224
cabal-version: >=1.10
2325
homepage: http://haskell-servant.readthedocs.org/
2426
bug-reports: http://github.com/haskell-servant/servant-js/issues
25-
tested-with: GHC==7.8.4, GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
27+
tested-with:
28+
GHC ==7.8.4
29+
|| ==7.10.3
30+
|| ==8.0.2
31+
|| ==8.2.2
32+
|| ==8.4.4
33+
|| ==8.6.1
34+
2635
extra-source-files:
2736
include/*.h
2837
CHANGELOG.md
@@ -43,7 +52,7 @@ library
4352
Servant.JS.Internal
4453
Servant.JS.JQuery
4554
Servant.JS.Vanilla
46-
build-depends: base >= 4.7 && <4.12
55+
build-depends: base >= 4.7 && <4.13
4756
, base-compat >= 0.9
4857
, charset >= 0.3
4958
, lens >= 4

0 commit comments

Comments
 (0)