Skip to content

Commit 5cb1e74

Browse files
phadejphadej
committed
Allow servant-0.16
1 parent 3388a6e commit 5cb1e74

File tree

4 files changed

+66
-52
lines changed

4 files changed

+66
-52
lines changed

‎.travis.yml‎

Lines changed: 52 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' '--config' 'servant-js.cabal'
3+
# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'servant-js.cabal'
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
77
language: c
8-
sudo: false
8+
dist: xenial
99

1010
git:
1111
submodules: false # whether to recursively clone submodules
@@ -20,103 +20,110 @@ cache:
2020
- $HOME/.cabal/store
2121

2222
before_cache:
23-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
23+
- rm -fv $CABALHOME/packages/hackage.haskell.org/build-reports.log
2424
# remove files that are regenerated by 'cabal update'
25-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*
26-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json
27-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache
28-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
29-
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
25+
- rm -fv $CABALHOME/packages/hackage.haskell.org/00-index.*
26+
- rm -fv $CABALHOME/packages/hackage.haskell.org/*.json
27+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.cache
28+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar
29+
- rm -fv $CABALHOME/packages/hackage.haskell.org/01-index.tar.idx
3030

31-
- rm -rfv $HOME/.cabal/packages/head.hackage
31+
- rm -rfv $CABALHOME/packages/head.hackage
3232

3333
matrix:
3434
include:
35-
- compiler: "ghc-8.6.1"
36-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
37-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}
35+
- compiler: "ghc-8.6.3"
36+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
3837
- compiler: "ghc-8.4.4"
39-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
4038
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
4139
- compiler: "ghc-8.2.2"
42-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
4340
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.2.2], sources: [hvr-ghc]}}
4441
- compiler: "ghc-8.0.2"
45-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
4642
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.0.2], sources: [hvr-ghc]}}
4743

4844
before_install:
49-
- HC=${CC}
45+
- HC=/opt/ghc/bin/${CC}
46+
- HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//')
47+
- echo $HCVER
5048
- HCPKG=${HC/ghc/ghc-pkg}
5149
- unset CC
50+
- CABAL=/opt/ghc/bin/cabal
51+
- CABALHOME=$HOME/.cabal
52+
- export PATH="$CABALHOME/bin:$PATH"
5253
- ROOTDIR=$(pwd)
53-
- mkdir -p $HOME/.local/bin
54-
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
5554
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
5655
- echo $HCNUMVER
5756

5857
install:
59-
- cabal --version
58+
- ${CABAL} --version
6059
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
61-
- BENCH=${BENCH---enable-benchmarks}
62-
- TEST=${TEST---enable-tests}
63-
- HADDOCK=${HADDOCK-true}
64-
- UNCONSTRAINED=${UNCONSTRAINED-true}
65-
- NOINSTALLEDCONSTRAINTS=${NOINSTALLEDCONSTRAINTS-false}
60+
- TEST=--enable-tests
61+
- BENCH=--enable-benchmarks
6662
- GHCHEAD=${GHCHEAD-false}
67-
- travis_retry cabal update -v
68-
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
63+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then export CABALHOME=$APPDATA/cabal; else export CABALHOME=$HOME/.cabal; fi
64+
- travis_retry ${CABAL} update -v
65+
- sed -i.bak 's/^jobs:/-- jobs:/' $CABALHOME/config
6966
- rm -fv cabal.project cabal.project.local
70-
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
71-
- "printf 'packages: \".\"\\n' > cabal.project"
67+
- grep -Ev -- '^\s*--' $CABALHOME/config | grep -Ev '^\s*$'
68+
- rm -f cabal.project
69+
- touch cabal.project
70+
- "printf 'packages: \".\"\\n' >> cabal.project"
71+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
7272
- touch cabal.project.local
73-
- "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"
73+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-js)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
7474
- cat cabal.project || true
7575
- cat cabal.project.local || true
76-
- if [ -f "./configure.ac" ]; then
77-
(cd "." && autoreconf -i);
78-
fi
76+
- if [ -f "./configure.ac" ]; then (cd "." && autoreconf -i); fi
7977
- rm -f cabal.project.freeze
80-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
81-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
78+
- ${CABAL} new-freeze -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dry
79+
- "cat \"cabal.project.freeze\" | sed -E 's/^(constraints: *| *)//' | sed 's/any.//'"
80+
- rm "cabal.project.freeze"
81+
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
82+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
8283
- rm -rf .ghc.environment.* "."/dist
8384
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
8485

8586
# Here starts the actual work to be performed for the package under test;
8687
# any command which exits with a non-zero exit code causes the build to fail.
8788
script:
8889
# test that source-distributions can be generated
89-
- cabal new-sdist all
90+
- ${CABAL} new-sdist all
9091
- mv dist-newstyle/sdist/*.tar.gz ${DISTDIR}/
9192
- cd ${DISTDIR} || false
9293
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
93-
- "printf 'packages: servant-js-*/*.cabal\\n' > cabal.project"
94+
- rm -f cabal.project
95+
- touch cabal.project
96+
- "printf 'packages: \"servant-js-*/*.cabal\"\\n' >> cabal.project"
97+
- "printf 'write-ghc-environment-files: always\\n' >> cabal.project"
9498
- touch cabal.project.local
95-
- "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"
99+
- "for pkg in $($HCPKG list --simple-output); do echo $pkg | sed 's/-[^-]*$//' | grep -vE -- '^(servant-js)$' | sed 's/^/constraints: /' | sed 's/$/ installed/' >> cabal.project.local; done"
96100
- cat cabal.project || true
97101
- cat cabal.project.local || true
98102
# this builds all libraries and executables (without tests/benchmarks)
99-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
103+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all
100104

101105
# build & run tests, build benchmarks
102-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
103-
- if [ "x$TEST" = "x--enable-tests" ]; then cabal new-test -w ${HC} ${TEST} ${BENCH} all; fi
106+
- ${CABAL} new-build -w ${HC} ${TEST} ${BENCH} all
107+
- if [ "x$TEST" = "x--enable-tests" ]; then ${CABAL} new-test -w ${HC} ${TEST} ${BENCH} all; fi
104108

105109
# cabal check
106-
- (cd servant-js-* && cabal check)
110+
- (cd servant-js-* && ${CABAL} check)
107111

108112
# haddock
109-
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
113+
- ${CABAL} new-haddock -w ${HC} ${TEST} ${BENCH} all
110114

111115
# Build without installed constraints for packages in global-db
112-
- if $UNCONSTRAINED; then rm -f cabal.project.local; echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks all; else echo "Not building without installed constraints"; fi
116+
- rm -f cabal.project.local; ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks all;
113117

114118
# Constraint sets
115119
- rm -rf cabal.project.local
116120

117121
# Constraint set servant-0.15
118-
- if [ $HCNUMVER -ge 80000 ] && [ $HCNUMVER -lt 80800 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all; else echo skipping...; fi
122+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all
119123

124+
# Constraint set servant-0.16
125+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all
120126

121-
# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-js.cabal"]
127+
128+
# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","servant-js.cabal"]
122129
# EOF

‎cabal.haskell-ci‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
branches: master
2+
3+
constraint-set servant-0.15
4+
ghc: >= 8.0 && <8.8
5+
constraints: servant ==0.15.*
6+
7+
constraint-set servant-0.16
8+
ghc: >= 8.0 && <8.8
9+
constraints: servant ==0.16.*

‎cabal.make-travis-yml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎servant-js.cabal‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: servant-js
22
version: 0.9.4
3+
x-revision: 1
34

45
synopsis: Automatically derive javascript functions to query servant webservices.
56
category: Web, Servant
@@ -27,7 +28,7 @@ tested-with:
2728
GHC ==8.0.2
2829
|| ==8.2.2
2930
|| ==8.4.4
30-
|| ==8.6.1
31+
|| ==8.6.3
3132

3233
extra-source-files:
3334
include/*.h
@@ -54,7 +55,7 @@ library
5455
, charset >= 0.3.7.1 && <0.4
5556
, lens >= 4.17 && <4.18
5657
, servant-foreign >= 0.15 && <0.16
57-
, servant >= 0.15 && <0.16
58+
, servant >= 0.15 && <0.17
5859
, text >= 1.2.3.0 && < 1.3
5960

6061
hs-source-dirs: src
@@ -92,10 +93,10 @@ test-suite spec
9293
other-modules:
9394
Servant.JSSpec
9495
Servant.JSSpec.CustomHeaders
95-
build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.7
96+
build-tool-depends: hspec-discover:hspec-discover >=2.6.0 && <2.8
9697
build-depends: base
9798
, base-compat
98-
, hspec >= 2.6.0 && <2.7
99+
, hspec >= 2.6.0 && <2.8
99100
, hspec-expectations
100101
, language-ecmascript >= 0.16
101102
, lens

0 commit comments

Comments
 (0)