Merge pull request #5361 from commercialhaskell/stable-release

stack-2.3.3

Author: borsboom

.github/workflows/integration-tests.yml

@@ -34,6 +34,10 @@ jobs:
         run: |
           set -ex
 
+          # Work around 'git status' always showing symlinks modified on Windows; see
+          # https://github.com/git-for-windows/git/issues/2653#issuecomment-640234081
+          git config --global core.fscache false
+
           stack upgrade || curl -sSL https://get.haskellstack.org/ | sh -s - -f
 
           if [[ "${{ matrix.os }}" == "ubuntu-latest" ]]

ChangeLog.md

@@ -1,16 +1,10 @@
 # Changelog
 
 
-## Unreleased changes
-
-Release notes:
+## v2.3.3
 
 **Changes since v2.3.1**
 
-Major changes:
-
-Behavior changes:
-
 Other enhancements:
 
 * Add the `stack-developer-mode` flag
@@ -21,7 +15,6 @@ Bug fixes:
 * Fix the problem of `stack repl foo:test:bar` failing without a project
   build before that. See
   [#5213](https://github.com/commercialhaskell/stack/issues/5213)
-
 * Fix `stack sdist` introducing unneded sublibrary syntax when using
   pvp-bounds. See
   [#5289](https://github.com/commercialhaskell/stack/issues/5289)

package.yaml

@@ -1,5 +1,5 @@
 name: stack
-version: '2.3.2'
+version: '2.3.3'
 synopsis: The Haskell Tool Stack
 description: |
   Please see the documentation at <https://docs.haskellstack.org>
@@ -92,7 +92,7 @@ dependencies:
 - network-uri
 - open-browser
 - optparse-applicative
-- pantry
+- pantry >= 0.4 && < 0.5
 - casa-client
 - casa-types
 - path

stack-ghc-810.yaml

@@ -14,8 +14,6 @@ nix:
     - unzip
 flags:
   stack:
-    hide-dependency-versions: true
-    supported-build: true
     developer-mode: true
 
 ghc-options:

stack-ghc-88.yaml

@@ -14,8 +14,6 @@ nix:
     - unzip
 flags:
   stack:
-    hide-dependency-versions: true
-    supported-build: true
     developer-mode: true
 
 ghc-options:

stack.cabal

@@ -4,10 +4,10 @@ cabal-version: 2.0
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 09229f434502c702e4058371b91cc64f9e800aab8abe66fb228d8da3137558b7
+-- hash: 4088422ebf565b9347481c01d786688d78b9aadc34246063f6c05ca732b41ff1
 
 name:           stack
-version:        2.3.2
+version:        2.3.3
 synopsis:       The Haskell Tool Stack
 description:    Please see the documentation at <https://docs.haskellstack.org>
                 for usage information.
@@ -272,7 +272,7 @@ library
     , network-uri
     , open-browser
     , optparse-applicative
-    , pantry
+    , pantry >=0.4 && <0.5
     , path
     , path-io
     , persistent
@@ -396,7 +396,7 @@ executable stack
     , network-uri
     , open-browser
     , optparse-applicative
-    , pantry
+    , pantry >=0.4 && <0.5
     , path
     , path-io
     , persistent
@@ -519,7 +519,7 @@ executable stack-integration-test
     , open-browser
     , optparse-applicative
     , optparse-generic
-    , pantry
+    , pantry >=0.4 && <0.5
     , path
     , path-io
     , persistent
@@ -647,7 +647,7 @@ test-suite stack-test
     , network-uri
     , open-browser
     , optparse-applicative
-    , pantry
+    , pantry >=0.4 && <0.5
     , path
     , path-io
     , persistent

test/integration/tests/2433-ghc-by-version/Main.hs

@@ -1,5 +1,7 @@
 import System.Process (rawSystem)
 import Control.Exception (throwIO)
+import StackTest
+import Control.Monad (unless)
 
 main :: IO ()
-main = rawSystem "bash" ["run.sh"] >>= throwIO
+main = unless isWindows $ rawSystem "bash" ["run.sh"] >>= throwIO