Allow base-4.17 (ghc-9.4)

haskellari · Aug 11, 2022 · ea6b28e · ea6b28e
1 parent 35395cc
commit ea6b28e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml
@@ -8,9 +8,9 @@
 #
 # For more information, see https://github.com/haskell-CI/haskell-ci
 #
-# version: 0.15.20220609
+# version: 0.15.20220808
 #
-# REGENDATA ("0.15.20220609",["github","microstache.cabal"])
+# REGENDATA ("0.15.20220808",["github","microstache.cabal"])
 #
 name: Haskell-CI
 on:
@@ -32,9 +32,14 @@ jobs:
     strategy:
       matrix:
         include:
-          - compiler: ghc-9.2.3
+          - compiler: ghc-9.4.1
             compilerKind: ghc
-            compilerVersion: 9.2.3
+            compilerVersion: 9.4.1
+            setup-method: ghcup
+            allow-failure: false
+          - compiler: ghc-9.2.4
+            compilerKind: ghc
+            compilerVersion: 9.2.4
             setup-method: ghcup
             allow-failure: false
           - compiler: ghc-9.0.2
@@ -100,7 +105,7 @@ jobs:
           apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5
           if [ "${{ matrix.setup-method }}" = ghcup ]; then
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)
             "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
@@ -109,7 +114,7 @@ jobs:
             apt-get update
             apt-get install -y "$HCNAME"
             mkdir -p "$HOME/.ghcup/bin"
-            curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"
+            curl -sL https://downloads.haskell.org/ghcup/0.1.18.0/x86_64-linux-ghcup-0.1.18.0 > "$HOME/.ghcup/bin/ghcup"
             chmod a+x "$HOME/.ghcup/bin/ghcup"
             "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
           fi

diff --git a/microstache.cabal b/microstache.cabal
@@ -1,6 +1,6 @@
 name:               microstache
 version:            1.0.2.1
-x-revision:         2
+x-revision:         3
 cabal-version:      >=1.10
 license:            BSD3
 license-file:       LICENSE
@@ -41,7 +41,8 @@ tested-with:
    || ==8.8.4
    || ==8.10.7
    || ==9.0.2
-   || ==9.2.3
+   || ==9.2.4
+   || ==9.4.1
 
 source-repository head
   type:     git
@@ -50,7 +51,7 @@ source-repository head
 library
   build-depends:
       aeson                 >=0.11    && <1.6 || >=2.0.0.0 && <2.2
-    , base                  >=4.5     && <4.17
+    , base                  >=4.5     && <4.18
     , containers            >=0.4.2.1 && <0.7
     , deepseq               >=1.3.0.0 && <1.5
     , directory             >=1.1.0.2 && <1.4