From 5365770fdcc2fe6b7332da3cd75b3753d1144b83 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
Date: Thu, 4 Feb 2021 00:14:46 +0200
Subject: [PATCH 1/3] =?UTF-8?q?0.19.0=20=E2=86=92=200.19.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yml | 24 +++++++++++++++++++++++-
 CHANGELOG.md                |  9 +++++++--
 package.yaml                |  2 +-
 spago.cabal                 |  2 +-
 4 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 80e87d0cc..1d93cb049 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,11 +43,33 @@ jobs:
         run: mkdir -p "$HOME/.local/bin"
       - name: Add ~/.local/bin to PATH
         run: echo "$HOME/.local/bin" >> $GITHUB_PATH
-      - uses: actions/cache@v2
+
+      # Caching
+      #
+      # `haskell/actions/setup` will overwrite the STACK_ROOT variable
+      # to "C:\sr" on Windows and `$HOME/.stack` on non-Windows OS.
+      # So, we use OS-specific caching rules to workaround this difference
+      # between OSes.
+      # For Windows, we also cache the folder that stores the GHC we use
+      # as well as other programs it uses.
+      - name: Cache ~/.stack on non-Windows OS
+        uses: actions/cache@v2
+        if: runner.os != 'Windows'
         with:
           path: |
             ~/.stack
           key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-1
+      - name: Cache C:\sr on Windows OS
+        uses: actions/cache@v2
+        if: runner.os == 'Windows'
+        with:
+          # Cache both STACK_ROOT and the folder containing
+          # Stack-related files
+          path: |
+            C:\sr
+            $HOME\AppData\Local\Programs\stack\x86_64-windows
+          key: ${{ runner.os }}-${{ hashFiles('stack.yaml') }}-1
+
       - run: npm install -g purescript@0.13.8 psc-package@3.0.1 bower@1.8.8
 
       - name: Install dependencies
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 651a76532..53f63ee5a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.19.1] - 2021-02-04
+
+Bugfixes:
+- Fix `psa` not being found on Windows (#740, #693)
+
 Other improvements:
 - Bump `dhall` dependency from 1.37.1 to 1.38.0 (#739)
-- Fix `psa` not being found on Windows (#740, #693)
+- Fix caching on Windows CI (#728, #741)
 
-## [0.19.0] - 2021-01-02
+## [0.19.0] - 2021-01-06
 
 Breaking changes (😱!!!):
 - **Deprecate `-d` flag for `deps-only` (#712)** - instead only support the `--deps-only` long form
diff --git a/package.yaml b/package.yaml
index 11e24aff3..0e1237f84 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name:                spago
-version:             0.19.0
+version:             0.19.1
 github:              "purescript/spago"
 license:             BSD3
 author:              "Justin Woo, Fabrizio Ferrai"
diff --git a/spago.cabal b/spago.cabal
index d8fc0bda4..c490f0125 100644
--- a/spago.cabal
+++ b/spago.cabal
@@ -7,7 +7,7 @@ cabal-version: 1.12
 -- hash: dcc2a8871af2db9eb05f8143f9ce2ff0c422d58560e4bcd7c06e5e3cdeb9d36a
 
 name:           spago
-version:        0.19.0
+version:        0.19.1
 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

From e795f7091bb08dd555392bfecdc899e00b371205 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
Date: Thu, 4 Feb 2021 00:15:19 +0200
Subject: [PATCH 2/3] Update set

---
 templates/packages.dhall | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/packages.dhall b/templates/packages.dhall
index 9a8067a2e..f6ad56465 100644
--- a/templates/packages.dhall
+++ b/templates/packages.dhall
@@ -105,6 +105,6 @@ in  upstream
 -------------------------------
 -}
 let upstream =
-      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20201021/packages.dhall sha256:55ebdbda1bd6ede4d5307fbc1ef19988c80271b4225d833c8d6fb9b6fb1aa6d8
+      https://github.com/purescript/package-sets/releases/download/psc-0.13.8-20210118/packages.dhall sha256:a59c5c93a68d5d066f3815a89f398bcf00e130a51cb185b2da29b20e2d8ae115
 
 in  upstream

From 86f4f8be8dcf2ddcca4c124722622d82c0dd1b05 Mon Sep 17 00:00:00 2001
From: Fabrizio Ferrai <fabrizio.ferrai@gmail.com>
Date: Thu, 4 Feb 2021 00:54:04 +0200
Subject: [PATCH 3/3] Fix tests

---
 test/SpagoSpec.hs                      | 2 +-
 test/fixtures/spago-bower-import.dhall | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/SpagoSpec.hs b/test/SpagoSpec.hs
index 2fbb3ce7a..77dbe8277 100644
--- a/test/SpagoSpec.hs
+++ b/test/SpagoSpec.hs
@@ -4,7 +4,7 @@ import           Control.Concurrent (threadDelay)
 import qualified Data.Text          as Text
 import           Prelude            hiding (FilePath)
 import qualified System.IO.Temp     as Temp
-import           Test.Hspec         (Spec, around_, describe, it, shouldBe, shouldNotBe, shouldNotSatisfy,
+import           Test.Hspec         (Spec, around_, describe, it, shouldBe, shouldNotSatisfy,
                                      shouldReturn, shouldSatisfy)
 import           Turtle             (ExitCode (..), cd, cp, decodeString, empty, encodeString,
                                      mkdir, mktree, mv, pwd, readTextFile, rm, shell,
diff --git a/test/fixtures/spago-bower-import.dhall b/test/fixtures/spago-bower-import.dhall
index 2c0713ace..f21f0aec2 100644
--- a/test/fixtures/spago-bower-import.dhall
+++ b/test/fixtures/spago-bower-import.dhall
@@ -12,7 +12,6 @@ You can edit this file as you like.
   , "foreign"
   , "foreign-object"
   , "generics-rep"
-  , "globals"
   , "nullable"
   , "prelude"
   , "psci-support"