Skip to content

Commit 6468836

Browse files
phadejphadej
authored
Merge pull request #25 from haskell-servant/servant-0.16
Allow servant-0.16
2 parents 675e173 + cdc1d95 commit 6468836

File tree

7 files changed

+144
-106
lines changed

7 files changed

+144
-106
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
dist/
22
dist-newstyle/
33
.stack-work/
4+
.ghc.environment.*

‎.travis.yml

Lines changed: 58 additions & 44 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-multipart.cabal'
3+
# haskell-ci '--output' '.travis.yml' '--config=cabal.haskell-ci' 'servant-multipart.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,102 +20,116 @@ 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.2"
36-
# env: TEST=--disable-tests BENCH=--disable-benchmarks
37-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.2], 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-multipart | 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-multipart)$' | 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-multipart-*/*.cabal\\n' > cabal.project"
94+
- rm -f cabal.project
95+
- touch cabal.project
96+
- "printf 'packages: \"servant-multipart-*/*.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-multipart | 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-multipart)$' | 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
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
103108

104109
# cabal check
105-
- (cd servant-multipart-* && cabal check)
110+
- (cd servant-multipart-* && ${CABAL} check)
106111

107112
# haddock
108-
- 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
109114

110115
# Build without installed constraints for packages in global-db
111-
- 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;
112117

113118
# Constraint sets
114119
- rm -rf cabal.project.local
115120

121+
# Constraint set network-2.8
122+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='network == 2.8.*' all
123+
124+
# Constraint set network-3.0
125+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='network == 3.0.*' all
126+
116127
# Constraint set servant-0.15
117-
- 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
128+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.15.*' all
129+
130+
# Constraint set servant-0.16
131+
- ${CABAL} new-build -w ${HC} --disable-tests --disable-benchmarks --constraint='servant ==0.16.*' all
118132

119133

120-
# REGENDATA ["--branch","master","--output",".travis.yml","--config","servant-multipart.cabal"]
134+
# REGENDATA ["--output",".travis.yml","--config=cabal.haskell-ci","servant-multipart.cabal"]
121135
# EOF

‎CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
0.11.4
2+
------
3+
4+
- Change `upload` to be test-suite
5+
- Support servant-0.16
6+
17
0.11.3
28
------
39

‎cabal.haskell-ci

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
branches: master
2+
3+
constraint-set network-2.8
4+
ghc: >= 8.0 && <8.8
5+
constraints: network == 2.8.*
6+
7+
constraint-set network-3.0
8+
ghc: >= 8.0 && <8.8
9+
constraints: network == 3.0.*
10+
11+
constraint-set servant-0.15
12+
ghc: >= 8.0 && <8.8
13+
constraints: servant ==0.15.*
14+
15+
constraint-set servant-0.16
16+
ghc: >= 8.0 && <8.8
17+
constraints: servant ==0.16.*

‎cabal.make-travis-yml

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

‎exe/Upload.hs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ import Control.Concurrent
66
import Control.Monad
77
import Control.Monad.IO.Class
88
import Data.Text.Encoding (encodeUtf8)
9-
import Network (withSocketsDo)
9+
import Network.Socket (withSocketsDo)
1010
import Network.HTTP.Client hiding (Proxy)
1111
import Network.HTTP.Client.MultipartFormData
1212
import Network.Wai
1313
import Network.Wai.Handler.Warp
1414
import Servant
1515
import Servant.Multipart
16+
import System.Environment (getArgs)
1617

1718
import qualified Data.ByteString.Lazy as LBS
1819

@@ -49,14 +50,18 @@ startServer :: IO ()
4950
startServer = run 8080 (serve api upload)
5051

5152
main :: IO ()
52-
main = withSocketsDo $ do
53-
forkIO startServer
54-
-- we fork the server in a separate thread and send a test
55-
-- request to it from the main thread.
56-
manager <- newManager defaultManagerSettings
57-
req <- parseRequest "http://localhost:8080/"
58-
resp <- flip httpLbs manager =<< formDataBody form req
59-
print resp
53+
main = do
54+
args <- getArgs
55+
case args of
56+
("run":_) -> withSocketsDo $ do
57+
forkIO startServer
58+
-- we fork the server in a separate thread and send a test
59+
-- request to it from the main thread.
60+
manager <- newManager defaultManagerSettings
61+
req <- parseRequest "http://localhost:8080/"
62+
resp <- flip httpLbs manager =<< formDataBody form req
63+
print resp
64+
_ -> putStrLn "Pass run to run"
6065

6166
where form =
6267
[ partBS "title" "World"

‎servant-multipart.cabal

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,66 @@
1-
name: servant-multipart
2-
version: 0.11.3
3-
synopsis: multipart/form-data (e.g file upload) support for servant
1+
name: servant-multipart
2+
version: 0.11.4
3+
synopsis: multipart/form-data (e.g file upload) support for servant
44
description:
55
This package adds support for file upload to the servant ecosystem. It draws
66
on ideas and code from several people who participated in the (in)famous
77
[ticket #133](https://github.com/haskell-servant/servant/issues/133) on
88
servant's issue tracker.
9-
homepage: https://github.com/haskell-servant/servant-multipart#readme
10-
license: BSD3
11-
license-file: LICENSE
12-
author: Alp Mestanogullari
13-
maintainer: [email protected]
14-
copyright: 2016-2017 Alp Mestanogullari
15-
category: Web, Servant
16-
build-type: Simple
17-
cabal-version: >=1.10
18-
extra-source-files: CHANGELOG.md
19-
tested-with:
20-
GHC ==8.0.2
21-
|| ==8.2.2
22-
|| ==8.4.4
23-
|| ==8.6.2
9+
10+
homepage: https://github.com/haskell-servant/servant-multipart#readme
11+
license: BSD3
12+
license-file: LICENSE
13+
author: Alp Mestanogullari
14+
maintainer: [email protected]
15+
copyright: 2016-2017 Alp Mestanogullari, 2018-2019 Servant Contributors
16+
category: Web, Servant
17+
build-type: Simple
18+
cabal-version: >=1.10
19+
extra-source-files: CHANGELOG.md
20+
tested-with: GHC ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
2421

2522
library
26-
default-language: Haskell2010
27-
hs-source-dirs: src
28-
exposed-modules: Servant.Multipart
23+
default-language: Haskell2010
24+
hs-source-dirs: src
25+
exposed-modules: Servant.Multipart
2926

3027
-- ghc boot libs
3128
build-depends:
32-
base >= 4.9 && < 5,
33-
bytestring >= 0.10.8.1 && < 0.11,
34-
directory >= 1.3 && < 1.4,
35-
text >= 1.2.3.0 && < 1.3,
36-
transformers >= 0.5.2.0 && < 0.6
29+
base >=4.9 && <5
30+
, bytestring >=0.10.8.1 && <0.11
31+
, directory >=1.3 && <1.4
32+
, text >=1.2.3.0 && <1.3
33+
, transformers >=0.5.2.0 && <0.6
3734

3835
-- other dependencies
3936
build-depends:
40-
http-media >= 0.7.1.3 && <0.8,
41-
lens >= 4.17 && < 4.18,
42-
resourcet >= 1.2.2 && <1.3,
43-
servant >= 0.15 && <0.16,
44-
servant-docs >= 0.10 && <0.15,
45-
servant-foreign >= 0.15 && <0.16,
46-
servant-server >= 0.15 && <0.16,
47-
wai >= 3.2.1.2 && <3.3,
48-
wai-extra >= 3.0.24.3 && <3.1
37+
http-media >=0.7.1.3 && <0.8
38+
, lens >=4.17 && <4.18
39+
, resourcet >=1.2.2 && <1.3
40+
, servant >=0.15 && <0.17
41+
, servant-docs >=0.10 && <0.15
42+
, servant-foreign >=0.15 && <0.16
43+
, servant-server >=0.15 && <0.17
44+
, wai >=3.2.1.2 && <3.3
45+
, wai-extra >=3.0.24.3 && <3.1
4946

50-
executable upload
51-
hs-source-dirs: exe
52-
main-is: Upload.hs
53-
default-language: Haskell2010
47+
test-suite upload
48+
type: exitcode-stdio-1.0
49+
hs-source-dirs: exe
50+
main-is: Upload.hs
51+
default-language: Haskell2010
5452
build-depends:
55-
base,
56-
http-client,
57-
bytestring,
58-
network,
59-
servant,
60-
servant-multipart,
61-
servant-server,
62-
text,
63-
transformers,
64-
warp,
65-
wai
53+
base
54+
, bytestring
55+
, http-client
56+
, network >=2.8 && <3.1
57+
, servant
58+
, servant-multipart
59+
, servant-server
60+
, text
61+
, transformers
62+
, wai
63+
, warp
6664

6765
source-repository head
6866
type: git

0 commit comments

Comments
 (0)