Make CI pass

.github/workflows/haskell.yml

@@ -158,7 +158,7 @@ jobs:
         git diff --exit-code
 
   # Check formatting for cabal files
-  cabal-fmt:
+  cabal-gild:
     runs-on: ${{ matrix.os }}
 
     strategy:
@@ -199,22 +199,22 @@ jobs:
     - name: Cache cabal store
       uses: actions/cache@v4
       env:
-        cache-name: cache-cabal-cabal-fmt
+        cache-name: cache-cabal-cabal-gild
       with:
         path: ${{ steps.setup-haskell.outputs.cabal-store }}
         key: ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-${{ env.hackage-index-state }}
         restore-keys: |
           ${{ runner.os }}-${{ matrix.ghc }}-${{ env.cache-name }}-
 
-    - name: Install cabal-fmt
-      run: cabal install --ignore-project --index-state="${{ env.hackage-index-state }}" cabal-fmt-0.1.12
+    - name: Install cabal-gild
+      run: cabal install --ignore-project --index-state="${{ env.hackage-index-state }}" cabal-gild-1.5.0.1
 
-    - name: Record cabal-fmt version
+    - name: Record cabal-gild version
       run: |
-        which cabal-fmt
-        cabal-fmt --version
+        which cabal-gild
+        cabal-gild --version
 
-    - name: Run cabal-fmt
+    - name: Run cabal-gild
       run: |
         ./scripts/format-cabal.sh
         git diff --exit-code

rawlock/test/Main.hs

@@ -10,7 +10,6 @@ module Main (main) where
 
 import Control.Concurrent.Class.MonadSTM.Strict
 import Control.Exception (throw)
-import Control.Monad (void)
 import Control.Monad.Class.MonadAsync
 import Control.Monad.Class.MonadFork
 import Control.Monad.Class.MonadSay
@@ -308,7 +307,7 @@ prop_unsafe_actions actions@(a1, a2, a3) = counterexample (show actions) $
                       (atomically (unsafeAcquireReadAccess l))
                       (const $ atomically (unsafeReleaseReadAccess l))
                       (say . ("Read: " <>) . show)
-            Incr -> void $ generalBracket
+            Incr -> generalBracket
                       (unsafeAcquireWriteAccess l)
                       (\orig -> \case
                           ExitCaseSuccess s' -> unsafeReleaseWriteAccess l s'
@@ -317,8 +316,8 @@ prop_unsafe_actions actions@(a1, a2, a3) = counterexample (show actions) $
                       (\s -> do
                           say ("Incr: " <> show s)
                           pure (s + 1)
-                      )
-            Append -> void $ generalBracket
+                      ) >> pure ()
+            Append -> generalBracket
                         (unsafeAcquireAppendAccess l)
                         (\orig -> \case
                             ExitCaseSuccess s' -> unsafeReleaseAppendAccess l s'
@@ -327,7 +326,7 @@ prop_unsafe_actions actions@(a1, a2, a3) = counterexample (show actions) $
                         (\s -> do
                             say ("Append: " <> show s)
                             pure (s + 1)
-                        )
+                        ) >> pure ()
       t1 <- async $ c a1
       t2 <- async $ c a2
       t3 <- async $ c a3

resource-registry/test/Main.hs

@@ -34,7 +34,9 @@ import Control.Monad.Class.MonadFork
 import Control.Monad.Class.MonadThrow
 import Control.Monad.Class.MonadTimer.SI
 import Control.Monad.Except
+#if __GLASGOW_HASKELL__ > 904
 import Control.Monad.IO.Class
+#endif
 import Control.ResourceRegistry
 import Data.Foldable
 import Data.Function

scripts/format-stylish.sh

@@ -31,7 +31,7 @@ if ! command -v "$fdcmd" &> /dev/null; then
     fi
 fi
 
-$fdcmd $PARGS -e hs -E test/Main.hs -X stylish-haskell $CARGS -i
+$fdcmd $PARGS -e hs -E resource-registry/test/Main.hs -X stylish-haskell $CARGS -i
 
 case "$(uname -s)" in
     MINGW*) git ls-files --eol | grep "w/crlf" | awk '{print $4}' | xargs dos2unix;;