Merge pull request #5579 from commercialhaskell/cachebust

Cache bust and disable some Mac tests

Author: snoyberg

.github/workflows/integration-tests.yml

@@ -23,18 +23,21 @@ jobs:
         include:
         - os: ubuntu-latest
           release-args: "--alpine"
+          cache-bust: ""
         - os: windows-latest
           release-args: ""
+          cache-bust: ""
         - os: macos-latest
           release-args: ""
+          cache-bust: "1"
     steps:
       - name: Clone project
         uses: actions/checkout@v2
       - name: Cache dependencies
         uses: actions/cache@v1
         with:
           path: ~/.stack
-          key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}
+          key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}${{ matrix.cache-bust }}
       - shell: bash
         name: Install deps and run checks
         run: |

test/integration/lib/StackTest.hs

@@ -252,6 +252,9 @@ exeExt = if isWindows then ".exe" else ""
 isWindows :: Bool
 isWindows = os == "mingw32"
 
+isLinux :: Bool
+isLinux = os == "linux"
+
 -- | Is the OS Alpine Linux?
 getIsAlpine :: IO Bool
 getIsAlpine = doesFileExist "/etc/alpine-release"

test/integration/tests/1336-1337-new-package-names/Main.hs

@@ -8,7 +8,7 @@ main :: IO ()
 main =
     if isWindows
         then logInfo "Disabled on Windows (see https://github.com/commercialhaskell/stack/issues/1337#issuecomment-166118678)"
-        else do
+        else when isLinux $ do
             safeNew "1234a-4b-b4-abc-12b34"
             doesExist "./1234a-4b-b4-abc-12b34/stack.yaml"
             stackErr ["new", "1234-abc"]

test/integration/tests/3850-cached-templates-network-errors/Main.hs

@@ -1,13 +1,13 @@
 import StackTest
-import Control.Monad (unless)
+import Control.Monad (when, unless)
 import Data.List (isInfixOf)
 import Data.Maybe (fromMaybe)
 import System.Directory
 import System.Environment (lookupEnv, setEnv)
 import System.FilePath
 
 main :: IO ()
-main = do
+main = when isLinux $ do
   performCachingTest templateUrl
   performCachingTest githubTemplate
   where
@@ -19,7 +19,7 @@ main = do
       removeDirectoryRecursive "tmp"
       setEnv "HTTPS_PROXY" "http://sdsgsfgslfgsjflgkjs" -- make https requests fail
       stackCheckStderr arguments $ \stderr ->
-        unless ("Using cached local version" `isInfixOf` stderr) 
+        unless ("Using cached local version" `isInfixOf` stderr)
         (error "stack didn't load the cached template")
 
       removeDirectoryRecursive "tmp"
@@ -31,7 +31,7 @@ main = do
     templateUrl :: String
     templateUrl =
       "https://raw.githubusercontent.com/commercialhaskell/stack-templates/986836cc85b0c8c5bbb78d7b94347ba095089b03/tasty-discover.hsfiles"
-  
+
     -- the same template, cached differently
     githubTemplate :: String
     githubTemplate = "github:commercialhaskell/tasty-discover.hsfiles"

test/integration/tests/git-submodules/Main.hs

@@ -4,10 +4,10 @@ import System.Exit (exitFailure)
 import System.FilePath ((</>))
 import Data.List (filter)
 import System.IO (hPutStrLn, withFile, IOMode(..))
-import Control.Monad (unless)
+import Control.Monad (when)
 
 main :: IO ()
-main = unless isWindows $ do
+main = when isLinux $ do
     let
       gitInit = do
          runShell "git init ."