Prep for v2.5.0.1 (release candidate)

Author: borsboom

.github/workflows/integration-tests.yml

@@ -3,9 +3,13 @@ name: Integration tests
 on:
   pull_request:
   push:
-    branches: [master, stable]
+    branches:
+      - master
+      - stable
+      - rc/**
   schedule:
   - cron: "0 0 * * *"
+  workflow_dispatch:
 
 jobs:
   integration-tests:

.github/workflows/unit-tests.yml

@@ -3,7 +3,11 @@ name: Unit tests
 on:
   pull_request:
   push:
-    branches: [master, stable]
+    branches:
+      - master
+      - stable
+      - rc/**
+  workflow_dispatch:
 
 jobs:
   style:

ChangeLog.md

@@ -1,9 +1,7 @@
 # Changelog
 
 
-## Unreleased changes
-
-Release notes:
+## v2.5.0.1 (release candidate)
 
 **Changes since v2.3.3**
 
@@ -43,6 +41,7 @@ Bug fixes:
   the build process.
   [#5125](https://github.com/commercialhaskell/stack/issues/5125)
 
+
 ## v2.3.3
 
 **Changes since v2.3.1**

doc/GUIDE.md

@@ -450,7 +450,7 @@ With that out of the way, let's dig a little bit more into these package sets,
 also known as *snapshots*. We mentioned the LTS resolvers, and you can get quite a bit of
 information about it at [https://www.stackage.org/lts](https://www.stackage.org/lts), including:
 
-* The appropriate resolver value (`resolver: lts-14.27`, as is currently the latest LTS)
+* The appropriate resolver value (`resolver: lts-16.15`, as is currently the latest LTS)
 * The GHC version used
 * A full list of all packages available in this snapshot
 * The ability to perform a Hoogle search on the packages in this snapshot
@@ -467,7 +467,7 @@ default as well).
 
 ## Resolvers and changing your compiler version
 
-Let's explore package sets a bit further. Instead of lts-14.27, let's change our
+Let's explore package sets a bit further. Instead of lts-16.15, let's change our
 `stack.yaml` file to use [the latest nightly](https://www.stackage.org/nightly). Right now,
 this is currently 2020-03-24 - please see the resolve from the link above to get the latest.
 
@@ -483,8 +483,8 @@ We can also change resolvers on the command line, which can be useful in a
 Continuous Integration (CI) setting, like on Travis. For example:
 
 ```
-michael@d30748af6d3d:~/helloworld$ stack --resolver lts-14.27 build
-Downloaded lts-14.27 build plan.
+michael@d30748af6d3d:~/helloworld$ stack --resolver lts-16.15 build
+Downloaded lts-16.15 build plan.
 # build output ...
 ```
 
@@ -1143,7 +1143,7 @@ follows the Unix convention of `--` to separate these, e.g.:
 ```
 michael@d30748af6d3d:~$ stack exec --package stm -- echo I installed the stm package via --package stm
 Run from outside a project, using implicit global project config
-Using latest snapshot resolver: lts-14.27
+Using latest snapshot resolver: lts-16.15
 Writing global (non-project-specific) config file to: /home/michael/.stack/global/stack.yaml
 Note: You can change the snapshot via the resolver field there.
 I installed the stm package via --package stm

doc/maintainers/releases.md

@@ -77,27 +77,28 @@ Examples:
 
 * In RC branch:
     * Review documentation for any changes that need to be made
-        * Ensure all documentation pages listed in `mkdocs.yaml`
-          (`git diff --stat origin/stable..HEAD doc/`)
+        * Ensure all documentation pages listed in `mkdocs.yaml` (use `git diff
+          --stat origin/stable..HEAD doc/` to look for new/deleted files)
         * Any new documentation pages should have the "may not be correct for
           the released version of Stack" warning at the top.
         * Search for old Stack version, unstable stack version, and the next
           "obvious" possible versions in sequence, and
-          `UNRELEASED` and replace with next release version (`X.Y.1`, where Y is odd). 
+          `UNRELEASED` and replace with next release version (`X.Y.1`, where Y is odd).
             * Do **NOT** update the Dockerfiles in [stackage/automated/dockerfiles](https://github.com/commercialhaskell/stackage/tree/master/automated/dockerfiles/) yet; that will come later)
             * Do **NOT** update templates in `.github` to point at the new release version yet!
         * Search for old resolvers, set to latest resolver (e.g. in `doc/GUIDE.md` where it references the "currently the latest LTS")
         * Look for any links to "latest" (`latest/`) documentation, replace with version tag
     * Check that for any platform entries that need to be added to (or removed from)
       [releases.yaml](https://github.com/fpco/stackage-content/blob/master/stack/releases.yaml),
       [install_and_upgrade.md](https://github.com/commercialhaskell/stack/blob/master/doc/install_and_upgrade.md), [get-stack.sh](https://github.com/commercialhaskell/stack/blob/master/etc/scripts/get-stack.sh), and [doc/README.md](https://github.com/commercialhaskell/stack/blob/master/doc/README.md), and get.haskellstack.org redirects.
-    * `package.yaml`: bump to next release candidate version (bump patchlevel (fourth) component to next odd number; e.g. from `1.9.0.0` to `1.9.0.1`)
-    * `ChangeLog.md`
-        - Rename the “Unreleased changes” section to the same version as package.yaml, and mark it clearly as a release candidate (e.g. `v1.9.0.1 (release candidate)`).  Remove any empty sections.
 
 * For first release candidate:
     * Re-do the pre-release checks (above section)
     * `package.yaml`: bump to first odd patchlevel version (e.g. `X.Y.0.1`)
+    * `ChangeLog.md`
+        - Rename the “Unreleased changes” section to the same version as
+          package.yaml, and mark it clearly as a release candidate (e.g.
+          `vX.Y.0.1 (release candidate)`).  Remove any empty sections.
     * Follow steps in *Release process* below tagged with `[RC]` to make a release candidate
 
 * For subsequent release candidates:

package.yaml

@@ -1,5 +1,5 @@
 name: stack
-version: '2.5.0.0'
+version: '2.5.0.1'
 synopsis: The Haskell Tool Stack
 description: |
   Please see the documentation at <https://docs.haskellstack.org>

stack-ghc-810.yaml

@@ -1,4 +1,4 @@
-resolver: nightly-2020-08-03
+resolver: nightly-2020-09-23
 
 packages:
 - .
@@ -20,8 +20,6 @@ ghc-options:
    "$locals": -fhide-source-paths
 
 extra-deps:
-- rio-0.1.19.0@rev:0
-- rio-prettyprint-0.1.1.0@rev:0
 - pantry-0.5.1.3@rev:0
 
 drop-packages:

stack.cabal

@@ -4,10 +4,10 @@ cabal-version: 2.0
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 88433abe924041186adc81b3f69022819047d5eb44eb272937327254a4787516
+-- hash: 61645c5963ed18f7201973f007d50d07d5ff7c5fb7232cf958a505c0ccaa5992
 
 name:           stack
-version:        2.4.0
+version:        2.5.0.1
 synopsis:       The Haskell Tool Stack
 description:    Please see the documentation at <https://docs.haskellstack.org>
                 for usage information.