Skip to content

Commit 94e0acc

Browse files
phadejphadej
authored
Merge pull request #1145 from haskell-servant/ghc-8.6.4
Use ghc-8.6.4 on travis
2 parents bdbc602 + e52e11a commit 94e0acc

File tree

28 files changed

+57
-57
lines changed

28 files changed

+57
-57
lines changed

‎.travis.yml

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#
55
# For more information, see https://github.com/haskell-CI/haskell-ci
66
#
7+
# version: 0.2.1
8+
#
79
language: c
810
dist: xenial
911

@@ -32,8 +34,8 @@ before_cache:
3234

3335
matrix:
3436
include:
35-
- compiler: "ghc-8.6.3"
36-
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.3], sources: [hvr-ghc]}}
37+
- compiler: "ghc-8.6.4"
38+
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.6.4], sources: [hvr-ghc]}}
3739
- compiler: "ghc-8.4.4"
3840
addons: {apt: {packages: [ghc-ppa-tools,cabal-install-2.4,ghc-8.4.4], sources: [hvr-ghc]}}
3941
- compiler: "ghc-8.2.2"
@@ -43,8 +45,6 @@ matrix:
4345

4446
before_install:
4547
- HC=/opt/ghc/bin/${CC}
46-
- HCVER=$(echo "$TRAVIS_COMPILER" | sed 's/ghc-//')
47-
- echo $HCVER
4848
- HCPKG=${HC/ghc/ghc-pkg}
4949
- unset CC
5050
- CABAL=/opt/ghc/bin/cabal
@@ -78,19 +78,19 @@ install:
7878
- "printf 'packages: \"servant-machines\"\\n' >> cabal.project"
7979
- "printf 'packages: \"servant-conduit\"\\n' >> cabal.project"
8080
- "printf 'packages: \"servant-pipes\"\\n' >> cabal.project"
81-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/basic-auth\"\\n' >> cabal.project ; fi"
82-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/curl-mock\"\\n' >> cabal.project ; fi"
83-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/basic-streaming\"\\n' >> cabal.project ; fi"
84-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/db-postgres-pool\"\\n' >> cabal.project ; fi"
85-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/db-sqlite-simple\"\\n' >> cabal.project ; fi"
86-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"
87-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"
88-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"
89-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi"
90-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"
91-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"
92-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"
93-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"
81+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-auth\"\\n' >> cabal.project ; fi"
82+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/curl-mock\"\\n' >> cabal.project ; fi"
83+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/basic-streaming\"\\n' >> cabal.project ; fi"
84+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-postgres-pool\"\\n' >> cabal.project ; fi"
85+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/db-sqlite-simple\"\\n' >> cabal.project ; fi"
86+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/file-upload\"\\n' >> cabal.project ; fi"
87+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/generic\"\\n' >> cabal.project ; fi"
88+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/https\"\\n' >> cabal.project ; fi"
89+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/pagination\"\\n' >> cabal.project ; fi"
90+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/testing\"\\n' >> cabal.project ; fi"
91+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/structuring-apis\"\\n' >> cabal.project ; fi"
92+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-custom-monad\"\\n' >> cabal.project ; fi"
93+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"doc/cookbook/using-free-client\"\\n' >> cabal.project ; fi"
9494
- "echo 'constraints: foundation >=0.0.14' >> cabal.project"
9595
- "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
9696
- "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"
@@ -156,19 +156,19 @@ script:
156156
- "printf 'packages: \"servant-machines-*/*.cabal\"\\n' >> cabal.project"
157157
- "printf 'packages: \"servant-conduit-*/*.cabal\"\\n' >> cabal.project"
158158
- "printf 'packages: \"servant-pipes-*/*.cabal\"\\n' >> cabal.project"
159-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"
160-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-curl-mock-*/*.cabal\"\\n' >> cabal.project ; fi"
161-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-basic-streaming-*/*.cabal\"\\n' >> cabal.project ; fi"
162-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-db-postgres-pool-*/*.cabal\"\\n' >> cabal.project ; fi"
163-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-db-sqlite-simple-*/*.cabal\"\\n' >> cabal.project ; fi"
164-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"
165-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"
166-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"
167-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi"
168-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"
169-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"
170-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"
171-
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80603 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"
159+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-auth-*/*.cabal\"\\n' >> cabal.project ; fi"
160+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-curl-mock-*/*.cabal\"\\n' >> cabal.project ; fi"
161+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-basic-streaming-*/*.cabal\"\\n' >> cabal.project ; fi"
162+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-postgres-pool-*/*.cabal\"\\n' >> cabal.project ; fi"
163+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-db-sqlite-simple-*/*.cabal\"\\n' >> cabal.project ; fi"
164+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-file-upload-*/*.cabal\"\\n' >> cabal.project ; fi"
165+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-generic-*/*.cabal\"\\n' >> cabal.project ; fi"
166+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-https-*/*.cabal\"\\n' >> cabal.project ; fi"
167+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-pagination-*/*.cabal\"\\n' >> cabal.project ; fi"
168+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-testing-*/*.cabal\"\\n' >> cabal.project ; fi"
169+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-structuring-apis-*/*.cabal\"\\n' >> cabal.project ; fi"
170+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-custom-monad-*/*.cabal\"\\n' >> cabal.project ; fi"
171+
- "if [ $HCNUMVER -eq 80404 ] || [ $HCNUMVER -eq 80604 ] ; then printf 'packages: \"cookbook-using-free-client-*/*.cabal\"\\n' >> cabal.project ; fi"
172172
- "echo 'constraints: foundation >=0.0.14' >> cabal.project"
173173
- "echo 'constraints: memory <0.14.12 || >0.14.12' >> cabal.project"
174174
- "echo 'allow-newer: servant-quickcheck:servant' >> cabal.project"

‎doc/cookbook/basic-auth/basic-auth.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-basic-auth
1414
main-is: BasicAuth.lhs

‎doc/cookbook/basic-streaming/basic-streaming.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-basic-streaming
1414
main-is: Streaming.lhs

‎doc/cookbook/curl-mock/curl-mock.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbock-curl-mock
1414
main-is: CurlMock.lhs

‎doc/cookbook/db-postgres-pool/db-postgres-pool.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-db-postgres-pool
1414
main-is: PostgresPool.lhs

‎doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-db-sqlite-simple
1414
main-is: DBConnection.lhs

‎doc/cookbook/file-upload/file-upload.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-file-upload
1414
main-is: FileUpload.lhs

‎doc/cookbook/generic/generic.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-using-custom-monad
1414
main-is: Generic.lhs

‎doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ maintainer: [email protected]
1111
category: Servant
1212
build-type: Simple
1313
cabal-version: >=1.10
14-
tested-with: GHC==8.4.4, GHC==8.6.3
14+
tested-with: GHC==8.4.4, GHC==8.6.4
1515

1616
executable cookbook-hoist-server-with-context
1717
main-is: HoistServerWithContext.lhs

‎doc/cookbook/https/https.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ author: Servant Contributors
88
maintainer: [email protected]
99
build-type: Simple
1010
cabal-version: >=1.10
11-
tested-with: GHC==8.4.4, GHC==8.6.3
11+
tested-with: GHC==8.4.4, GHC==8.6.4
1212

1313
executable cookbook-https
1414
main-is: Https.lhs

0 commit comments

Comments
 (0)