Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add supports for ghc-8.10.4 #27

Closed
wants to merge 1 commit into from
Closed

Add supports for ghc-8.10.4 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 86 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,101 @@ before_cache:
- rm -rfv $CABALHOME/packages/head.hackage
jobs:
include:
- compiler: ghc-8.10.4
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.10.4", "cabal-install-3.0"],
},
}
os: linux
- compiler: ghc-8.8.1
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.8.1","cabal-install-3.0"]}}
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.8.1", "cabal-install-3.0"],
},
}
os: linux
- compiler: ghc-8.6.5
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.6.5","cabal-install-3.0"]}}
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.6.5", "cabal-install-3.0"],
},
}
os: linux
- compiler: ghc-8.4.4
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.4.4","cabal-install-3.0"]}}
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.4.4", "cabal-install-3.0"],
},
}
os: linux
- compiler: ghc-8.2.2
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.2.2","cabal-install-3.0"]}}
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.2.2", "cabal-install-3.0"],
},
}
os: linux
- compiler: ghc-8.0.2
addons: {"apt":{"sources":[{"sourceline":"deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main","key_url":"https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286"}],"packages":["ghc-8.0.2","cabal-install-3.0"]}}
addons:
{
"apt":
{
"sources":
[
{
"sourceline": "deb http://ppa.launchpad.net/hvr/ghc/ubuntu xenial main",
"key_url": "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x063dab2bdc0b3f9fcebc378bff3aeacef6f88286",
},
],
"packages": ["ghc-8.0.2", "cabal-install-3.0"],
},
}
os: linux
before_install:
- HC=$(echo "/opt/$CC/bin/ghc" | sed 's/-/\//')
Expand Down Expand Up @@ -139,6 +220,5 @@ script:
# Building without installed constraints for packages in global-db...
- rm -f cabal.project.local
- ${CABAL} v2-build $WITHCOMPILER --disable-tests --disable-benchmarks all

# REGENDATA ("0.9.20200121",["--branches","master","-o",".travis.yml","servant-mock.cabal"])
# EOF
7 changes: 4 additions & 3 deletions servant-mock.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: >=1.10
name: servant-mock
version: 0.8.7
version: 0.9.7

synopsis: Derive a mock server for free from your servant API types
category: Servant, Web, Testing
Expand All @@ -23,6 +23,7 @@ tested-with:
|| ==8.4.4
|| ==8.6.5
|| ==8.8.1
|| ==8.10.4

extra-source-files: README.md CHANGELOG.md include/*.h

Expand All @@ -39,14 +40,14 @@ library
exposed-modules:
Servant.Mock
build-depends:
base >=4.9 && <4.14,
base >=4.9 && <4.15,
base-compat >=0.10.5 && <0.12,
bytestring >=0.10.8.1 && <0.11,
http-types >=0.12.2 && <0.13,
servant >=0.17 && <0.19,
servant-server >=0.17 && <0.19,
transformers >=0.5.2.0 && <0.6,
QuickCheck >=2.12.6.1 && <2.14,
QuickCheck >=2.12.6.1 && <2.14.3,
wai >=3.2.1.2 && <3.3
hs-source-dirs: src
default-language: Haskell2010
Expand Down
7 changes: 5 additions & 2 deletions src/Servant/Mock.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ instance
HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters =>
#endif
HasMock Raw context where
mock _ _ = Tagged $ \_req respond -> do
mock _ _ = Tagged $ \_req _respond -> do
bdy <- genBody
respond $ responseLBS status200 [] bdy
_respond $ responseLBS status200 [] bdy

where genBody = pack <$> generate (vector 100 :: Gen [Char])

Expand All @@ -217,6 +217,9 @@ instance HasMock api context => HasMock (Summary d :> api) context where
instance HasMock api context => HasMock (Description d :> api) context where
mock _ context = mock (Proxy :: Proxy api) context

instance (AtLeastOneFragment api, FragmentUnique (Fragment d :> api), HasMock api context) => HasMock (Fragment d :> api) context where
mock _ context = mock (Proxy :: Proxy api) context

instance ( HasContextEntry context (NamedContext name subContext)
#if MIN_VERSION_servant_server(0,18,0)
, HasContextEntry (context .++ DefaultErrorFormatters) ErrorFormatters
Expand Down