Merge pull request #5362 from commercialhaskell/merge-stable

Merge stable

Author: snoyberg

.github/ISSUE_TEMPLATE/bug_report.md

@@ -5,7 +5,7 @@ about: Report a bug in Stack
 
 Please follow the steps below for reporting a bug:
 
-Make sure that you are using the latest release (currently stack-2.3.1).
+Make sure that you are using the latest release (currently stack-2.3.3).
 See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
 
 Please use the following schema for your bug report:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature Request
 about: Request a feature be added to Stack, or discuss such a feature
 ---
 
-Make sure that you are using the latest release (currently stack-2.3.1).
+Make sure that you are using the latest release (currently stack-2.3.3).
 See the [upgrade instructions](http://docs.haskellstack.org/en/stable/install_and_upgrade/#upgrade) to upgrade.
 
 Please state as clearly as possible what feature you are recommending,

.github/workflows/integration-tests.yml

@@ -18,9 +18,7 @@ jobs:
         - os: ubuntu-latest
           release-args: "--alpine"
         - os: windows-latest
-          # Issues with symlinks cause things to appear dirty
-          # FIXME: we probably need to fix this so we get good output on stack --version
-          release-args: "--allow-dirty"
+          release-args: ""
         - os: macos-latest
           release-args: ""
     steps:
@@ -36,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

@@ -5,7 +5,7 @@
 
 Release notes:
 
-**Changes since v2.3.1**
+**Changes since v2.3.3**
 
 Major changes:
 * Add the `snapshot-location-base` yaml configuration option, which allows to override the default location of
@@ -27,6 +27,18 @@ Other enhancements:
   [#5280](https://github.com/commercialhaskell/stack/issues/5280)
 * Build failures now show a hint to scroll up to the corresponding section
   [#5279](https://github.com/commercialhaskell/stack/issues/5279)
+
+Bug fixes:
+
+* Fix `stack test --coverage` when using Cabal 3
+
+
+## v2.3.3
+
+**Changes since v2.3.1**
+
+Other enhancements:
+
 * Add the `stack-developer-mode` flag
 
 Bug fixes:
@@ -35,16 +47,13 @@ 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)
 * Fix modified time busting caches by always calculating sha256 digest
   during the build process.
   [#5125](https://github.com/commercialhaskell/stack/issues/5125)
 
-* Fix `stack test --coverage` when using Cabal 3
-
 ## v2.3.1
 
 Release notes:

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: