Add force

src/App.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
+{-# LANGUAGE DuplicateRecordFields #-}
 
 module App where
 
@@ -71,12 +72,15 @@ getSettings = do
         , fuzzyCacheFallbackBranches
         , primeCacheMode
         , mainBranch
+        , force = False
         }
 
 main :: IO ()
 main = do
-  args <- getCliArgs
-  settings <- getSettings
+  (args :: CliArgs) <- getCliArgs
+  settings' <- getSettings
+  let f = args.force
+  let settings = (settings' :: Settings) { force = f }
 
   let jobName = fromMaybe (FilePath.takeFileName args.cmd) args.name
 
@@ -394,6 +398,7 @@ snapshot appState args = do
     let currentHash = hexSha1 currentHashInput
 
     mainBranchCommit <- liftIO $ getMainBranchCommit appState
+    let force = appState.settings.force
 
     let hashInfo = HashInfo
           { hash = currentHash
@@ -404,7 +409,7 @@ snapshot appState args = do
     savedHashInfo <- liftIO $ readHashInfo appState
     let savedHash = savedHashInfo.hash
 
-    when (currentHash == savedHash) do
+    when (currentHash == savedHash && not force) do
       logDebug appState $ "Hash matches, hash=" <> savedHash <> ", skipping"
       earlyReturn (False, Just "local cache hit (?)")
 
@@ -416,7 +421,8 @@ snapshot appState args = do
       logDebug appState "Prime cache mode, assuming task is done and skippping!"
       earlyReturn (False, Nothing)
 
-    when (hasOutputs args) do
+
+    when (hasOutputs args && not force) do
       s <- RemoteCache.getRemoteCacheSettingsFromEnv
       success <- liftIO $ RemoteCache.restoreCache appState s (fromMaybe appState.settings.rootDirectory args.cacheRoot) (archiveName appState args currentHash) RemoteCache.Log
       when success do
@@ -425,7 +431,7 @@ snapshot appState args = do
 
     logInfo appState "Inputs changed, running task"
 
-    when (hasOutputs args && args.fuzzyCache && mainBranchCommitChanged savedHashInfo hashInfo) do
+    when (not force && hasOutputs args && args.fuzzyCache && mainBranchCommitChanged savedHashInfo hashInfo) do
       tryRestoreFuzzyCache appState args
 
     pure (True, Nothing)
@@ -463,7 +469,7 @@ readHashInfo appState = do
         pure h
   else
     pure emptyHashInfo
-      
+
 
 tryRestoreFuzzyCache :: MonadIO m => AppState -> SnapshotCliArgs -> m ()
 tryRestoreFuzzyCache appState args = do

src/CliArgs.hs

@@ -5,6 +5,7 @@ import Options.Applicative
 
 data CliArgs = CliArgs
     { name :: Maybe String  -- Optional name argument
+    , force :: Bool -- Skip cache
     , cmd  :: String        -- The command to run
     , args :: [String]      -- List of arguments for the command
     } deriving (Show)
@@ -16,6 +17,10 @@ commandParser = CliArgs
        <> short 'n'
        <> metavar "NAME"
        <> help "Optional name for the task" ))
+    <*> switch
+        ( long "force"
+       <> short 'f'
+       <> help "Skip cache and fuzzy cache" )
     <*> argument str
         ( metavar "CMD"
        <> help "The command to run" )

src/Types.hs

@@ -17,6 +17,7 @@ data Settings = Settings
   , fuzzyCacheFallbackBranches :: [Text]
   , primeCacheMode :: Bool
   , mainBranch :: Maybe Text
+  , force :: Bool
   } deriving (Show)
 
 type JobName = String