Fix updating for changing targets

Branches like master would now work
This commit is contained in:
Silvan Mosberger 2019-05-01 23:29:41 +02:00
parent 544ea0c96f
commit 4adafcd78b
No known key found for this signature in database
GPG Key ID: 9424360B4B85C9E7

View File

@ -10,7 +10,7 @@ import Control.Exception (handleJust)
import Control.Monad.Reader import Control.Monad.Reader
import Data.Aeson (decode) import Data.Aeson (decode)
import qualified Data.ByteString.Lazy.Char8 as BS import qualified Data.ByteString.Lazy.Char8 as BS
import Data.Char (isDigit) import Data.Char (isDigit, isHexDigit)
import Data.List (intercalate) import Data.List (intercalate)
import Data.Maybe import Data.Maybe
import Data.Time import Data.Time
@ -221,7 +221,7 @@ regenerate revision genDir = do
hash <- revHash hie revision hash <- revHash hie revision
liftIO $ putStrLn $ "Writing " ++ revision ++ " to " ++ genDir ++ "/revision" liftIO $ putStrLn $ "Writing " ++ revision ++ " to " ++ genDir ++ "/revision"
liftIO $ writeFile (genDir </> "revision") revision liftIO $ writeFile (genDir </> "revision") revision
git hie [ "checkout", revision ] git hie [ "checkout", if all isHexDigit revision then revision else "origin/" ++ revision ]
files <- repoPath hie >>= liftIO . listDirectory files <- repoPath hie >>= liftIO . listDirectory
let versions = mapMaybe (stackPathRegex `match`) files let versions = mapMaybe (stackPathRegex `match`) files
liftIO $ putStrLn $ "HIE " ++ revision ++ " has ghc versions " ++ intercalate ", " (map show versions) liftIO $ putStrLn $ "HIE " ++ revision ++ " has ghc versions " ++ intercalate ", " (map show versions)