Merge pull request #18 from fumieval/tweak-ci

Fix broken CI

.github/workflows/ci.yml → .github/workflows/haskell.yml

@@ -1,4 +1,4 @@
-name: ci
+name: Haskell CI
 
 on:
   push:
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-10.15]
-        ghc: ["8.6", "8.8", "8.10", "9.0"]
+        ghc: ["8.8", "8.10"]
         cabal: ["3.2"]
 
     steps:

README.md

@@ -1,5 +1,7 @@
 A WebAuthn verification library for relying parties.
 
+[![ci](https://github.com/fumieval/webauthn/actions/workflows/haskell.yml/badge.svg)](https://github.com/fumieval/webauthn/actions/workflows/haskell.yml)
+
 Demo
 ----
 

src/WebAuthn.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 -----------------------------------------------------------------------
 -- |
 -- Module      :  WebAuthn

src/WebAuthn/AndroidSafetyNet.hs

@@ -1,4 +1,5 @@
- {-# LANGUAGE OverloadedStrings #-} 
+{-# LANGUAGE OverloadedStrings #-} 
+{-# LANGUAGE DuplicateRecordFields #-}
 module WebAuthn.AndroidSafetyNet (
   decode,
   verify

src/WebAuthn/Packed.hs

@@ -1,3 +1,4 @@
+{-# LANGUAGE OverloadedStrings #-}
 module WebAuthn.Packed where
 
 import Data.ByteString.Lazy (fromStrict)

src/WebAuthn/Types.hs

@@ -3,6 +3,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 module WebAuthn.Types (
   -- * Relying party
   RelyingParty(..)

test/Tests.hs

@@ -1,3 +1,5 @@
+{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
 import WebAuthn
     ( registerCredential,

wai-middleware-webauthn/demo/demo.cabal

@@ -1,34 +1,40 @@
-cabal-version:       2.4
+cabal-version: 2.4
+
 -- Initial package description 'demo.cabal' generated by 'cabal init'.  For
 --  further documentation, see http://haskell.org/cabal/users-guide/
 
-name:                demo
-version:             0.1.0.0
+name:          demo
+version:       0.1.0.0
+
 -- synopsis:
 -- description:
 -- bug-reports:
 -- license:
-license-file:        LICENSE
-author:              Fumiaki Kinoshita
-maintainer:          [email protected]
+license-file:  LICENSE
+author:        Fumiaki Kinoshita
+maintainer:    [email protected]
+
 -- copyright:
 -- category:
 -- extra-source-files:  CHANGELOG.md
-data-files:
-  index.html
+data-files:    index.html
+
 executable demo
-  main-is:             Main.hs
+  main-is:          Main.hs
+
   -- other-extensions:
-  ghc-options: -threaded
-  build-depends:       base >=4.11.0.0
+  ghc-options:      -threaded
+  build-depends:
+    , aeson
+    , base                     >=4.11.0.0
+    , bytestring
+    , http-types
+    , wai
+    , wai-middleware-webauthn
     , warp
     , warp-tls
-    , wai-middleware-webauthn
-    , wai
-    , http-types
-    , bytestring
     , yaml
-    , aeson
+
   -- hs-source-dirs:
-  other-modules: Paths_demo
-  default-language:    Haskell2010
+  other-modules:    Paths_demo
+  default-language: Haskell2010

wai-middleware-webauthn/wai-middleware-webauthn.cabal

@@ -1,41 +1,45 @@
-cabal-version:       2.4
+cabal-version: 2.4
+
 -- Initial package description 'webauthn-proxy.cabal' generated by 'cabal
 -- init'.  For further documentation, see
 -- http://haskell.org/cabal/users-guide/
 
-name:                wai-middleware-webauthn
-version:             0.1.0.0
+name:          wai-middleware-webauthn
+version:       0.1.0.0
+
 -- synopsis:
 -- description:
 -- bug-reports:
 -- license:
-license-file:        LICENSE
-author:              Fumiaki Kinoshita
-maintainer:          [email protected]
+license-file:  LICENSE
+author:        Fumiaki Kinoshita
+maintainer:    [email protected]
+
 -- copyright:
 -- category:
 -- extra-source-files:  CHANGELOG.md
-data-files:
-  lib.js
+data-files:    lib.js
 
 library
-  build-depends: base == 4.*
-    , wai
-    , yaml
-    , webauthn
-    , text
+  build-depends:
+    , aeson
+    , base                  >=4 && <5
+    , base64-bytestring
     , bytestring
+    , cborg
+    , cryptonite
     , hashable
+    , http-types
     , serialise
-    , base64-bytestring
-    , aeson
+    , text
     , unordered-containers
-    , http-types
-    , cryptonite
-    , cborg
+    , wai
+    , webauthn
     , x509-store
-  exposed-modules: Network.Wai.Middleware.WebAuthn
-  ghc-options: -Wall
-  hs-source-dirs: src
-  default-language:    Haskell2010
-  other-modules: Paths_wai_middleware_webauthn
+    , yaml
+
+  exposed-modules:  Network.Wai.Middleware.WebAuthn
+  ghc-options:      -Wall
+  hs-source-dirs:   src
+  default-language: Haskell2010
+  other-modules:    Paths_wai_middleware_webauthn

webauthn.cabal

@@ -1,76 +1,67 @@
-cabal-version:       2.4
--- Initial package description 'webauthn.cabal' generated by 'cabal init'.
---   For further documentation, see http://haskell.org/cabal/users-guide/
-
-name:                webauthn
-version:             0.0.2
-synopsis:            Web Authentication API
--- description:
-homepage:            https://github.com/fumieval/webauthn
--- bug-reports:
-license:             BSD-3-Clause
-license-file:        LICENSE
-author:              Fumiaki Kinoshita, Sumit Raja <[email protected]>
-maintainer:          [email protected]
--- copyright:
-category:            Web
--- extra-source-files:  CHANGELOG.md
+cabal-version: 2.4
+name:          webauthn
+version:       0.0.2
+synopsis:      Web Authentication API
+homepage:      https://github.com/fumieval/webauthn
+bug-reports:   https://github.com/fumieval/webauthn/issues
+license:       BSD-3-Clause
+license-file:  LICENSE
+author:        Fumiaki Kinoshita, Sumit Raja <[email protected]>
+maintainer:    [email protected]
+category:      Web
+tested-with:    GHC == 8.8.4
+              , GHC == 8.10.4
 
 common base-common
-  build-depends: 
-    base == 4.*
-    , x509-store
-    , bytestring
-    , base64-bytestring
-    , errors
-    , aeson
+  build-depends:
+    , aeson             >=1.5  && <1.6
+    , base              >=4.13 && <4.15
+    , base64-bytestring >=1.2  && <1.3
+    , bytestring        >=0.10 && <0.12
+    , errors            >=2.3  && <2.4
+    , x509-store        >=1.6  && <1.7
+
+  default-language:   Haskell2010
 
 library
-  import: base-common
+  import:             base-common
+  hs-source-dirs:     src
   exposed-modules:
     WebAuthn
-    WebAuthn.Types
+    WebAuthn.AndroidSafetyNet
     WebAuthn.FIDOU2F
     WebAuthn.Packed
     WebAuthn.Signature
     WebAuthn.TPM
-    WebAuthn.AndroidSafetyNet
-  build-depends:       base == 4.*
-    , containers
-    , cryptonite
-    , cborg
-    , cereal
-    , hashable
-    , aeson
-    , asn1-types
-    , asn1-encoding
-    , text
-    , transformers
-    , x509
-    , x509-validation
-    , memory
-    , serialise
-    , base16-bytestring >= 1.0.0.0  && < 1.1.0.0
-    , base64-bytestring
-  hs-source-dirs:      src
-  ghc-options: -Wall
-  default-language:    Haskell2010
-  default-extensions:
-    DuplicateRecordFields
-    OverloadedStrings
+    WebAuthn.Types
+
+  build-depends:
+    , asn1-encoding     >=0.9  && <0.10
+    , asn1-types        >=0.3  && <0.4
+    , base16-bytestring >=1.0  && <1.1
+    , cborg             >=0.2  && <0.3
+    , cereal            >=0.5  && <0.6
+    , containers        >=0.6  && <0.7
+    , cryptonite        >=0.28 && <0.29
+    , hashable          >=1.3  && <1.4
+    , memory            >=0.14 && <1.16
+    , serialise         >=0.2  && <0.3
+    , text              >=1.2  && <1.3
+    , transformers      >=0.5  && <0.6
+    , x509              >=1.7  && <1.8
+    , x509-validation   >=1.6  && <1.7
+
+  ghc-options:        -Wall
 
 test-suite test-webauthn
-  import: base-common
-  type: exitcode-stdio-1.0
-  main-is: Tests.hs
-  hs-source-dirs:      test
-  default-language:    Haskell2010
-  default-extensions:
-    QuasiQuotes
-    OverloadedStrings
+  import:             base-common
+  type:               exitcode-stdio-1.0
+  hs-source-dirs:     test
+  main-is:            Tests.hs
+
   build-depends:
-    webauthn
-    , interpolate
-    , tasty
-    , tasty-hunit
-    , uri-bytestring
+    , interpolate    >=0.2  && <0.3
+    , tasty          >=1.4  && <1.5
+    , tasty-hunit    >=0.10 && <0.11
+    , uri-bytestring >=0.3  && <0.4
+    , webauthn