Regenerate .travis.yml; GHC-8.6.5; add GHCJS

phadej · phadej · commit ecbc04bbeeb6 · 2019-09-07T14:03:46.000+03:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/cabal.haskell-ci b/cabal.haskell-ci
@@ -2,6 +2,9 @@ folds: all-but-test
 branches: master
 jobs-selection: any
 
+-- https://github.com/haskell/cabal/issues/6176
+ghcjs-tools: hspec-discover
+
 -- We have inplace packages (servant-js) so we skip installing dependencies in a separate step
 install-dependencies: False
 
diff --git a/doc/cookbook/basic-auth/basic-auth.cabal b/doc/cookbook/basic-auth/basic-auth.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-basic-auth
   main-is:             BasicAuth.lhs
diff --git a/doc/cookbook/basic-streaming/basic-streaming.cabal b/doc/cookbook/basic-streaming/basic-streaming.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-basic-streaming
   main-is:             Streaming.lhs
diff --git a/doc/cookbook/curl-mock/curl-mock.cabal b/doc/cookbook/curl-mock/curl-mock.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbock-curl-mock
   main-is:             CurlMock.lhs
diff --git a/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal b/doc/cookbook/db-postgres-pool/db-postgres-pool.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-db-postgres-pool
   main-is:             PostgresPool.lhs
diff --git a/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal b/doc/cookbook/db-sqlite-simple/db-sqlite-simple.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-db-sqlite-simple
   main-is:             DBConnection.lhs
diff --git a/doc/cookbook/file-upload/file-upload.cabal b/doc/cookbook/file-upload/file-upload.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-file-upload
   main-is:             FileUpload.lhs
diff --git a/doc/cookbook/generic/generic.cabal b/doc/cookbook/generic/generic.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-using-custom-monad
   main-is:             Generic.lhs
diff --git a/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal b/doc/cookbook/hoist-server-with-context/hoist-server-with-context.cabal
@@ -11,7 +11,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-hoist-server-with-context
   main-is:             HoistServerWithContext.lhs
diff --git a/doc/cookbook/https/https.cabal b/doc/cookbook/https/https.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-https
   main-is:             Https.lhs
diff --git a/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal b/doc/cookbook/jwt-and-basic-auth/jwt-and-basic-auth.cabal
@@ -11,7 +11,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-jwt-and-basic-auth
   main-is:             JWTAndBasicAuth.lhs
diff --git a/doc/cookbook/open-id-connect/OpenIdConnect.cabal b/doc/cookbook/open-id-connect/OpenIdConnect.cabal
@@ -8,7 +8,7 @@ author:         Servant Contributors
 maintainer:     haskell-servant-maintainers@googlegroups.com
 build-type:     Simple
 cabal-version:  >= 1.10
-tested-with:    GHC==8.4.4, GHC==8.6.4
+tested-with:    GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-openidconnect
   main-is: OpenIdConnect.lhs
diff --git a/doc/cookbook/pagination/pagination.cabal b/doc/cookbook/pagination/pagination.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-pagination
   main-is:             Pagination.lhs
diff --git a/doc/cookbook/sentry/sentry.cabal b/doc/cookbook/sentry/sentry.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-sentry
   main-is:             Sentry.lhs
diff --git a/doc/cookbook/structuring-apis/structuring-apis.cabal b/doc/cookbook/structuring-apis/structuring-apis.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-structuring-apis
   main-is:             StructuringApis.lhs
diff --git a/doc/cookbook/testing/testing.cabal b/doc/cookbook/testing/testing.cabal
@@ -10,7 +10,7 @@ maintainer:          haskell-servant-maintainers@googlegroups.com
 category:            Servant
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-testing
   main-is:             Testing.lhs
diff --git a/doc/cookbook/using-custom-monad/using-custom-monad.cabal b/doc/cookbook/using-custom-monad/using-custom-monad.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-using-custom-monad
   main-is:             UsingCustomMonad.lhs
diff --git a/doc/cookbook/using-free-client/using-free-client.cabal b/doc/cookbook/using-free-client/using-free-client.cabal
@@ -8,7 +8,7 @@ author:              Servant Contributors
 maintainer:          haskell-servant-maintainers@googlegroups.com
 build-type:          Simple
 cabal-version:       >=1.10
-tested-with:         GHC==8.4.4, GHC==8.6.4
+tested-with:         GHC==8.4.4, GHC==8.6.5
 
 executable cookbook-using-free-client
   main-is:             UsingFreeClient.lhs
diff --git a/doc/tutorial/tutorial.cabal b/doc/tutorial/tutorial.cabal
@@ -16,7 +16,7 @@ tested-with:
   GHC==8.0.2
   GHC==8.2.2
   GHC==8.4.4
-  GHC==8.6.4
+  GHC==8.6.5
 extra-source-files:
   static/index.html
   static/ui.js
diff --git a/servant-client-core/servant-client-core.cabal b/servant-client-core/servant-client-core.cabal
@@ -20,7 +20,8 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
+  , GHCJS == 8.4
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-client/servant-client.cabal b/servant-client/servant-client.cabal
@@ -24,7 +24,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-conduit/servant-conduit.cabal b/servant-conduit/servant-conduit.cabal
@@ -21,7 +21,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-docs/servant-docs.cabal b/servant-docs/servant-docs.cabal
@@ -24,7 +24,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-foreign/servant-foreign.cabal b/servant-foreign/servant-foreign.cabal
@@ -26,7 +26,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-http-streams/servant-http-streams.cabal b/servant-http-streams/servant-http-streams.cabal
@@ -24,7 +24,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-machines/servant-machines.cabal b/servant-machines/servant-machines.cabal
@@ -21,7 +21,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-pipes/servant-pipes.cabal b/servant-pipes/servant-pipes.cabal
@@ -21,7 +21,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant-server/servant-server.cabal b/servant-server/servant-server.cabal
@@ -27,7 +27,7 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
 
 extra-source-files:
   CHANGELOG.md
diff --git a/servant/servant.cabal b/servant/servant.cabal
@@ -24,7 +24,8 @@ tested-with:
   GHC ==8.0.2
    || ==8.2.2
    || ==8.4.4
-   || ==8.6.4
+   || ==8.6.5
+  , GHCJS == 8.4
 
 extra-source-files:
   CHANGELOG.md
@@ -176,6 +177,9 @@ test-suite spec
     hspec-discover:hspec-discover >= 2.6.0 && < 2.8
 
 test-suite doctests
+  if impl(ghcjs)
+    buildable: False
+
   build-depends:
       base
     , servant
