ce2426d · streamly · git.iko.soy

git.iko.soy/streamly

Fix CI build issues

Fix Semigroup import for GHC 8.2.2 and Windows build issues.

commitce2426d175e95f7bf5bc4196e449d9237527ade1 authorRanjeet Ranjan <ranjeetr@composewell.com> dateMon 16 Nov 2020, 19:44 (6 years ago) parentb85002b

2 files changed+10−2

compare with master

unifiedsplit

src/Streamly/Internal/FileSystem/Event/Linux.hs+4 test/Streamly/Test/FileSystem/Event.hs+6−2

src/Streamly/Internal/FileSystem/Event/Linux.hs+4

@@ -156,6 +156,10 @@ import Data.Functor.Identity (runIdentity)

156156import Data.IntMap.Lazy (IntMap)

157157import Data.IORef (IORef, newIORef, readIORef, writeIORef, modifyIORef)

158158import Data.List.NonEmpty (NonEmpty)

159+

160+#if __GLASGOW_HASKELL__ < 808

161+import Data.Semigroup (Semigroup(..))

162+#endif

159163import Data.Word (Word8, Word32)

160164import Foreign.C.Error (throwErrnoIfMinus1)

161165import Foreign.C.String (CString)

test/Streamly/Test/FileSystem/Event.hs+6−2

@@ -10,7 +10,9 @@ module Main (main) where

1010

1111import Control.Concurrent (MVar, newEmptyMVar, putMVar, takeMVar, threadDelay)

1212import Control.Monad.IO.Class (MonadIO)

13+#if !defined(CABAL_OS_WINDOWS)

1314import Data.Char (ord)

15+#endif

1416import Data.Maybe (fromJust)

1517import Data.Word (Word8)

1618import System.Directory

@@ -24,7 +26,9 @@ import System.Directory

2426import System.FilePath ((</>))

2527import System.IO (BufferMode(..), hSetBuffering, stdout)

2628import System.IO.Temp (withSystemTempDirectory)

29+#if !defined(CABAL_OS_WINDOWS)

2730import System.IO.Unsafe (unsafePerformIO)

31+#endif

2832import Streamly.Internal.Data.Array.Storable.Foreign (Array)

2933

3034import Test.Hspec

@@ -160,8 +164,8 @@ renameFileNestedDirEvents =

160164 ]

161165

162166-- | Convert an 'Event' record to a short representation for unit test.

163−showEventShort :: Event -> String

164−showEventShort ev@Event{..} = getRelPath ev ++ "_" ++ show eventFlags

167+showEventShort :: Event.Event -> String

168+showEventShort ev@Event.Event{..} = Event.getRelPath ev ++ "_" ++ show eventFlags

165169

166170#else

167171