flat patch

obsidiansystems · May 14, 2024 · be378a9 · be378a9
1 parent 6595fc2
commit be378a9
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -1,19 +1,19 @@
 name: github-action
 
-on: [push, pull_request] 
+on: [push, pull_request]
 
 jobs:
   build:
     strategy:
       matrix:
-        ghc: ['8.6.5', '8.8.4']
+        ghc: ['8.6.5', '8.8.4', '8.10.7', '9.0.1', '9.2.4']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-haskell@v1
+    - uses: haskell/actions/setup@v1
       with:
         ghc-version: ${{ matrix.ghc }}
     - name: Cache
@@ -22,11 +22,12 @@ jobs:
         cache-name: cache-cabal
       with:
         path: ~/.cabal
-        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
+        key: ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-${{ hashFiles('**/*.cabal') }}-${{ hashFiles('**/cabal.project') }}
         restore-keys: |
-          ${{ runner.os }}-build-${{ env.cache-name }}-
-          ${{ runner.os }}-build-
-          ${{ runner.os }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-${{ env.cache-name }}-
+          ${{ runner.os }}-${{ matrix.ghc }}-build-
+          ${{ runner.os }}-${{ matrix.ghc }}-
+          ${{ runner.os }}
 
     - name: Install dependencies
       run: |
@@ -35,4 +36,6 @@ jobs:
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
     - name: Run tests
-      run: cabal test all
+      run: cabal test --enable-tests all
+    - name: Build Docs
+      run: cabal haddock
diff --git a/cli-git.cabal b/cli-git.cabal
@@ -12,22 +12,22 @@ build-type:         Simple
 extra-source-files: CHANGELOG.md
                     README.md
 
-tested-with: GHC ==8.6.5 || ==8.8.4
+tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.1 || ==9.2.4
 
 library
   exposed-modules:  Bindings.Cli.Git
   hs-source-dirs:   src
   default-language: Haskell2010
   build-depends:
-      base            >=4.12.0.0 && <4.15
+      base            >=4.12.0.0 && <4.19
     , cli-extras      >=0.2.1.0  && <0.3
     , containers      >=0.6.0.1  && <0.7
     , data-default    >=0.7.1.1  && <0.8
     , exceptions      >=0.10.3   && <0.11
-    , lens            >=4.17.1   && <4.20
-    , logging-effect  >=1.3.4    && <1.4
-    , megaparsec      >=7.0.5    && <9.1
-    , mtl             >=2.2.2    && <2.3
+    , lens            >=4.17.1   && <5.4
+    , logging-effect  >=1.3.4    && <1.5
+    , megaparsec      >=7.0.5    && <9.7
+    , mtl             >=2.2.2    && <2.4
     , text            >=1.2.3.1  && <1.3
     , which           >=0.2      && <0.3
 

diff --git a/src/Bindings/Cli/Git.hs b/src/Bindings/Cli/Git.hs
@@ -21,12 +21,14 @@ module Bindings.Cli.Git
 import Control.Applicative hiding (many)
 import Control.Monad.Catch (MonadMask)
 import Control.Monad.Except
+import Control.Monad.IO.Class (MonadIO)
 import Control.Monad.Fail
 import Control.Monad.Log
 import Data.Bool (bool)
 import Data.Bifunctor
 import Data.Char
 import Data.Either
+import Data.Functor (void)
 import Data.Map (Map)
 import qualified Data.Map as M
 import Data.Maybe (maybeToList)