CI debugging

Author: f-f

spago.cabal

@@ -4,10 +4,10 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 25f34ee90c40276d788a66523e0833707cf16645eadde749c8a953606886ab03
+-- hash: b88f8100a3b763c486e0f8eef011ce424bcca172077abeb8b10114b874428683
 
 name:           spago
-version:        0.16.0
+version:        0.17.0
 description:    Please see the README on GitHub at <https://github.com/purescript/spago#readme>
 homepage:       https://github.com/purescript/spago#readme
 bug-reports:    https://github.com/purescript/spago/issues
@@ -147,6 +147,7 @@ test-suite spec
   other-modules:
       BumpVersionSpec
       Spago.Build.ParserSpec
+      Spago.Command.PathSpec
       SpagoSpec
       Spec
       UnitSpec

src/Spago/Bower.hs

@@ -60,7 +60,9 @@ generateBowerJson = do
     die [ path <> " is being ignored by git - change this before continuing" ]
 
   logInfo "Generated a valid Bower config using the package set"
-  pure bowerJson
+  pure $ case OS.buildOS of
+    OS.Windows -> Text.replace "\n" "\r\n" bowerJson
+    _ -> bowerJson
 
 
 runBowerInstall :: (HasLogFunc env, HasBower env) => RIO env ()

src/Spago/Git.hs

@@ -29,7 +29,11 @@ hasCleanWorkingTree = do
     logDebug $ "git status stderr: " <> display err
     die [ "Unable to check git status. Perhaps git is not installed or this is not a git repository?" ]
 
-  pure $ out == ""
+  if out == ""
+  then pure True
+  else do
+    logDebug $ "Git working tree is not clean: " <> displayShow out
+    pure False
 
 
 getAllTags :: HasGit env => RIO env [Text]

src/Spago/Version.hs

@@ -99,6 +99,7 @@ bumpVersion
   -> RIO env ()
 bumpVersion dryRun spec = do
   newBowerConfig <- Bower.generateBowerJson
+  oldConfig :: Either SomeException Text <- try $ readTextFile Bower.path
 
   Git.requireCleanWorkingTree
 
@@ -112,6 +113,8 @@ bumpVersion dryRun spec = do
         Bower.runBowerInstall
         clean <- Git.hasCleanWorkingTree
         unless clean $ do
+          logDebug $ displayShow oldConfig
+          logDebug $ displayShow newBowerConfig
           die [ "A new " <> Bower.path <> " has been generated. Please commit this and run `bump-version` again." ]
 
   let tagAction = DryAction