Skip to content

Commit 7a82c41

Browse files
phadejphadej
authored
Merge pull request #14 from haskell-servant/servant-0.13
Allow servant-0.13
2 parents 3c88ec3 + fba7cc9 commit 7a82c41

File tree

3 files changed

+93
-58
lines changed

3 files changed

+93
-58
lines changed

‎.travis.yml

Lines changed: 66 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This Travis job script has been generated by a script via
22
#
3-
# make_travis_yml_2.hs '--branch' 'master' 'servant-multipart.cabal'
3+
# runghc make_travis_yml_2.hs '--branch' 'master' '--output' '.travis.yml' '--config' 'servant-multipart.cabal'
44
#
55
# For more information, see https://github.com/hvr/multi-ghc-travis
66
#
@@ -28,6 +28,8 @@ before_cache:
2828
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar
2929
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx
3030

31+
- rm -rfv $HOME/.cabal/packages/head.hackage
32+
3133
matrix:
3234
include:
3335
- compiler: "ghc-7.8.4"
@@ -39,63 +41,76 @@ matrix:
3941
- compiler: "ghc-8.0.2"
4042
# env: TEST=--disable-tests BENCH=--disable-benchmarks
4143
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.0.2], sources: [hvr-ghc]}}
42-
- compiler: "ghc-8.2.1"
44+
- compiler: "ghc-8.2.2"
4345
# env: TEST=--disable-tests BENCH=--disable-benchmarks
44-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.1], sources: [hvr-ghc]}}
46+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-head,ghc-8.2.2], sources: [hvr-ghc]}}
4547

4648
before_install:
47-
- HC=${CC}
48-
- HCPKG=${HC/ghc/ghc-pkg}
49-
- unset CC
50-
- PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$PATH
51-
- PKGNAME='servant-multipart'
49+
- HC=${CC}
50+
- HCPKG=${HC/ghc/ghc-pkg}
51+
- unset CC
52+
- ROOTDIR=$(pwd)
53+
- mkdir -p $HOME/.local/bin
54+
- "PATH=/opt/ghc/bin:/opt/ghc-ppa-tools/bin:$HOME/local/bin:$PATH"
55+
- HCNUMVER=$(( $(${HC} --numeric-version|sed -E 's/([0-9]+)\.([0-9]+)\.([0-9]+).*/\1 * 10000 + \2 * 100 + \3/') ))
56+
- echo $HCNUMVER
5257

5358
install:
54-
- cabal --version
55-
- echo "$(${HC} --version) [$(${HC} --print-project-git-commit-id 2> /dev/null || echo '?')]"
56-
- BENCH=${BENCH---enable-benchmarks}
57-
- TEST=${TEST---enable-tests}
58-
- HADDOCK=${HADDOCK-true}
59-
- INSTALLED=${INSTALLED-true}
60-
- travis_retry cabal update -v
61-
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
62-
- rm -fv cabal.project.local
63-
- "echo 'packages: .' > cabal.project"
64-
- rm -f cabal.project.freeze
65-
- cabal new-build -w ${HC} ${TEST} ${BENCH} --dep -j2 all
66-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --dep -j2 all
59+
- cabal --version
60+
- 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+
- INSTALLED=${INSTALLED-true}
65+
- GHCHEAD=${GHCHEAD-false}
66+
- travis_retry cabal update -v
67+
- "sed -i.bak 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config"
68+
- rm -fv cabal.project cabal.project.local
69+
- grep -Ev -- '^\s*--' ${HOME}/.cabal/config | grep -Ev '^\s*$'
70+
- "printf 'packages: \".\"\\n' > cabal.project"
71+
- cat cabal.project
72+
- if [ -f "./configure.ac" ]; then
73+
(cd "." && autoreconf -i);
74+
fi
75+
- rm -f cabal.project.freeze
76+
- cabal new-build -w ${HC} ${TEST} ${BENCH} --project-file="cabal.project" --dep -j2 all
77+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks --project-file="cabal.project" --dep -j2 all
78+
- rm -rf "."/.ghc.environment.* "."/dist
79+
- DISTDIR=$(mktemp -d /tmp/dist-test.XXXX)
6780

6881
# Here starts the actual work to be performed for the package under test;
6982
# any command which exits with a non-zero exit code causes the build to fail.
7083
script:
71-
- if [ -f configure.ac ]; then autoreconf -i; fi
72-
- rm -rf .ghc.environment.* dist/
73-
- cabal sdist # test that a source-distribution can be generated
74-
- cd dist/
75-
- SRCTAR=(${PKGNAME}-*.tar.gz)
76-
- SRC_BASENAME="${SRCTAR/%.tar.gz}"
77-
- tar -xvf "./$SRC_BASENAME.tar.gz"
78-
- cd "$SRC_BASENAME/"
79-
## from here on, CWD is inside the extracted source-tarball
80-
- rm -fv cabal.project.local
81-
- "echo 'packages: .' > cabal.project"
82-
# this builds all libraries and executables (without tests/benchmarks)
83-
- rm -f cabal.project.freeze
84-
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
85-
# this builds all libraries and executables (including tests/benchmarks)
86-
# - rm -rf ./dist-newstyle
87-
88-
# Build with installed constraints for packages in global-db
89-
- if $INSTALLED; then
90-
${HCPKG} list --global --simple-output --names-only | sed -r 's/([a-zA-Z0-9-]+*) */--constraint=\1 installed;/g' | sed 's/;$/;all/' | xargs -d ';' cabal new-build -w ${HC} --disable-tests --disable-benchmarks;
91-
else echo "Not building with installed constraints"; fi
92-
93-
# build & run tests, build benchmarks
94-
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
95-
96-
# haddock
97-
- rm -rf ./dist-newstyle
98-
- if $HADDOCK; then cabal new-haddock -w ${HC} --disable-tests --disable-benchmarks all; else echo "Skipping haddock generation";fi
99-
100-
# REGENDATA ["--branch","master","servant-multipart.cabal"]
84+
# test that source-distributions can be generated
85+
- (cd "." && cabal sdist)
86+
- mv "."/dist/servant-multipart-*.tar.gz ${DISTDIR}/
87+
- cd ${DISTDIR} || false
88+
- find . -maxdepth 1 -name '*.tar.gz' -exec tar -xvf '{}' \;
89+
- "printf 'packages: servant-multipart-*/*.cabal\\n' > cabal.project"
90+
- cat cabal.project
91+
# this builds all libraries and executables (without tests/benchmarks)
92+
- cabal new-build -w ${HC} --disable-tests --disable-benchmarks all
93+
94+
# Build with installed constraints for packages in global-db
95+
- if $INSTALLED; then echo cabal new-build -w ${HC} --disable-tests --disable-benchmarks $(${HCPKG} list --global --simple-output --names-only | sed 's/\([a-zA-Z0-9-]\{1,\}\) */--constraint="\1 installed" /g') all | sh; else echo "Not building with installed constraints"; fi
96+
97+
# build & run tests, build benchmarks
98+
- cabal new-build -w ${HC} ${TEST} ${BENCH} all
99+
100+
# cabal check
101+
- (cd servant-multipart-* && cabal check)
102+
103+
# haddock
104+
- rm -rf ./dist-newstyle
105+
- if $HADDOCK; then cabal new-haddock -w ${HC} ${TEST} ${BENCH} all; else echo "Skipping haddock generation";fi
106+
107+
- if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80200 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.10.*' all; else echo skipping...; fi
108+
109+
- if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.11.*' all; else echo skipping...; fi
110+
111+
- if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.12.*' all; else echo skipping...; fi
112+
113+
- if [ $HCNUMVER -ge 70800 ] && [ $HCNUMVER -lt 80400 ]; then cabal new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.13.*' all; else echo skipping...; fi
114+
115+
# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-multipart.cabal"]
101116
# EOF

‎cabal.make-travis-yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
constraint-set servant-0.10
2+
ghc: >= 7.8 && <8.2
3+
constraints: servant ==0.10.*
4+
5+
constraint-set servant-0.11
6+
ghc: >= 7.8 && <8.4
7+
constraints: servant ==0.11.*
8+
9+
constraint-set servant-0.12
10+
ghc: >= 7.8 && <8.4
11+
constraints: servant ==0.12.*
12+
13+
constraint-set servant-0.13
14+
ghc: >= 7.8 && <8.4
15+
constraints: servant ==0.13.*

‎servant-multipart.cabal

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
name: servant-multipart
22
version: 0.11
3+
x-revision: 1
34
synopsis: multipart/form-data (e.g file upload) support for servant
4-
description: Please see README.md
5+
description:
6+
This package adds support for file upload to the servant ecosystem. It draws
7+
on ideas and code from several people who participated in the (in)famous
8+
[ticket #133](https://github.com/haskell-servant/servant/issues/133) on
9+
servant's issue tracker.
510
homepage: https://github.com/haskell-servant/servant-multipart#readme
611
license: BSD3
712
license-file: LICENSE
@@ -16,7 +21,7 @@ tested-with:
1621
GHC==7.8.4,
1722
GHC==7.10.3,
1823
GHC==8.0.2,
19-
GHC==8.2.1
24+
GHC==8.2.2
2025

2126
library
2227
hs-source-dirs: src
@@ -26,11 +31,11 @@ library
2631
bytestring >= 0.10 && <0.11,
2732
directory,
2833
http-media >= 0.6 && <0.8,
29-
lens >= 4.0 && < 4.16,
30-
resourcet >=1.1 && <1.2,
31-
servant >=0.10 && <0.13,
32-
servant-docs >=0.10 && <0.13,
33-
servant-server >=0.10 && <0.13,
34+
lens >= 4.0 && < 4.17,
35+
resourcet >=1.1 && <1.3,
36+
servant >=0.10 && <0.14,
37+
servant-docs >=0.10 && <0.14,
38+
servant-server >=0.10 && <0.14,
3439
text >=1.2 && <1.3,
3540
transformers >=0.3 && <0.6,
3641
wai >= 3.2 && <3.3,

0 commit comments

Comments
 (0)