From 9c9d24cacb38cf73c24f66649ce46ab2d4d32bda Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Fri, 29 Sep 2023 23:55:41 +0100 Subject: [PATCH 1/3] Final release process (revised) step H --- ChangeLog.md | 14 ++++++++++++++ cabal.config | 2 +- package.yaml | 2 +- stack.cabal | 2 +- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 808ce8d8ca..dcf0851641 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,19 @@ # Changelog +## Unreleased changes + +Release notes: + +**Changes since v2.13.1:** + +Major changes: + +Behavior changes: + +Other enhancements: + +Bug fixes: + ## v2.13.1 - 2023-09-29 Release notes: diff --git a/cabal.config b/cabal.config index da1cb8641d..01270e6fd5 100644 --- a/cabal.config +++ b/cabal.config @@ -163,7 +163,7 @@ constraints: , socks ==0.6.1 , split ==0.2.3.5 , splitmix ==0.1.0.4 - , stack ==2.13.1 + , stack ==2.13.2 , static-bytes ==0.1.0 , stm ==2.5.1.0 , stm-chans ==3.0.0.9 diff --git a/package.yaml b/package.yaml index ef5a30d6a9..910b8d4ef6 100644 --- a/package.yaml +++ b/package.yaml @@ -2,7 +2,7 @@ spec-version: 0.35.0 name: stack -version: '2.13.1' +version: '2.13.2' synopsis: The Haskell Tool Stack description: | Please see the documentation at diff --git a/stack.cabal b/stack.cabal index 70f3500db2..ce29980a66 100644 --- a/stack.cabal +++ b/stack.cabal @@ -5,7 +5,7 @@ cabal-version: 2.0 -- see: https://github.com/sol/hpack name: stack -version: 2.13.1 +version: 2.13.2 synopsis: The Haskell Tool Stack description: Please see the documentation at for usage information. From e890c7f1ec3a923776eaf75d7b54107b4fc925a1 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sat, 30 Sep 2023 17:15:01 +0100 Subject: [PATCH 2/3] Remove reference to Stack 2.11.1 being 'current' --- doc/README.md | 8 ++++---- doc/install_and_upgrade.md | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/README.md b/doc/README.md index 15202028b6..709f9e48a7 100644 --- a/doc/README.md +++ b/doc/README.md @@ -122,10 +122,10 @@ Windows. !!! warning - The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (current) (only) - will replace the user `PATH` environment variable (rather than append to - it) if a 1024 character limit is exceeded. If the content of your - existing user `PATH` is long, preserve it before running the installer. + The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (only) will + replace the user `PATH` environment variable (rather than append to it) + if a 1024 character limit is exceeded. If the content of your existing + user `PATH` is long, preserve it before running the installer. !!! note diff --git a/doc/install_and_upgrade.md b/doc/install_and_upgrade.md index f30c0043b3..8ebb1b9853 100644 --- a/doc/install_and_upgrade.md +++ b/doc/install_and_upgrade.md @@ -428,10 +428,10 @@ GitHub repository. !!! warning "Long user PATH environment variable" - The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (current) (only) - will replace the user `PATH` environment variable (rather than append to - it) if a 1024 character limit is exceeded. If the content of your - existing user `PATH` is long, preserve it before running the installer. + The Windows installer for Stack 2.9.1, 2.9.3 and 2.11.1 (only) will + replace the user `PATH` environment variable (rather than append to it) + if a 1024 character limit is exceeded. If the content of your existing + user `PATH` is long, preserve it before running the installer. !!! note "Anti-virus software" From dfb448934bae18f66d15ea5d755968e99d25e417 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Sat, 30 Sep 2023 17:51:35 +0100 Subject: [PATCH 3/3] Fix #6262 Incorporate Matrix room into documentation --- CONTRIBUTING.md | 6 ++++++ README.md | 5 ++++- doc/README.md | 12 ++++++++---- doc/maintainers/releases.md | 8 ++++++++ doc/maintainers/team_process.md | 15 +++------------ 5 files changed, 29 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c44a29056..f4ccd39b78 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -714,3 +714,9 @@ If you're making deep changes and real-time communication with the Stack team would be helpful, we have a `#stack-collaborators` Slack channel in the Haskell Foundation workspace. To join the workspace, follow this [link](https://haskell-foundation.slack.com/join/shared_invite/zt-z45o9x38-8L55P27r12YO0YeEufcO2w#/shared-invite/email). + +## Matrix room + +There is also a +[Haskell Stack room](https://matrix.to/#/#haskell-stack:matrix.org) +at address `#haskell-stack:matrix.org` on [Matrix](https://matrix.org/). diff --git a/README.md b/README.md index 54586a52bd..2baaf92388 100644 --- a/README.md +++ b/README.md @@ -24,4 +24,7 @@ You can participate with the Stack community in the following areas: [Slack workspace](https://haskell-foundation.slack.com/join/shared_invite/zt-z45o9x38-8L55P27r12YO0YeEufcO2w#/shared-invite/email) * `#stack-users` channel, for general Stack discussion * `#stack-collaborators` channel, for working on Stack's code base -* the [Google Group mailing list](https://groups.google.com/g/haskell-stack) for Stack +* the [Haskell Stack room](https://matrix.to/#/#haskell-stack:matrix.org) on + [Matrix](https://matrix.org/) +* the [Google Group mailing list](https://groups.google.com/g/haskell-stack) for + Stack diff --git a/doc/README.md b/doc/README.md index 709f9e48a7..066a79bd4f 100644 --- a/doc/README.md +++ b/doc/README.md @@ -325,8 +325,12 @@ label on the GitHub issue tracker. ## How to contribute to the maintenance or development of Stack -The following assumes that you already have installed a version of Stack and the -[Git application](https://git-scm.com/). +A [guide](CONTRIBUTING.md) is provided to help potential contributors to the +Stack project. + +If you have already installed a version of Stack and the +[Git application](https://git-scm.com/) the followings steps should get you +started with building Stack from source with Stack: 1. Clone the `stack` repository from GitHub with the command: @@ -334,8 +338,8 @@ The following assumes that you already have installed a version of Stack and the git clone https://github.com/commercialhaskell/stack.git ~~~ -2. Change the current working directory to the cloned `stack` directory with the - command: +2. Change the current working directory to the cloned `stack` directory with + the command: ~~~text cd stack diff --git a/doc/maintainers/releases.md b/doc/maintainers/releases.md index 66d1fef164..c92ad20c1b 100644 --- a/doc/maintainers/releases.md +++ b/doc/maintainers/releases.md @@ -404,6 +404,10 @@ final release. Announce the release candidate in the `#stack-users` channel of the Haskell Foundation's Slack workspace. + Announce the release candidate in the + [Haskell Stack room](https://matrix.to/#/#haskell-stack:matrix.org) + (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/). + Announce the release candidate in Reddit's [Haskell](https://www.reddit.com/r/haskell/) community. @@ -674,6 +678,10 @@ final release. Announce the release in the `#stack-users` channel of the Haskell Foundation's Slack workspace. + Announce the release in the + [Haskell Stack room](https://matrix.to/#/#haskell-stack:matrix.org) + (address `#haskell-stack:matrix.org`) on [Matrix](https://matrix.org/). + Announce the release in Reddit's [Haskell](https://www.reddit.com/r/haskell/) community. diff --git a/doc/maintainers/team_process.md b/doc/maintainers/team_process.md index 9975e2c718..ac7ff9bfe7 100644 --- a/doc/maintainers/team_process.md +++ b/doc/maintainers/team_process.md @@ -15,7 +15,6 @@ distributed team ](https://github.com/commercialhaskell/stackage/blob/master/CURATORS.md)) and we hope to replicate that success here. - ## Goals The goals of the `Stack` maintainer team are to: @@ -39,7 +38,6 @@ The goals of the `Stack` maintainer team are to: The sections below detail various activities by the `Stack` team to realize these goals. - ## Issue triage The maintainer team provides ongoing review and responses to newly-filed GitHub @@ -65,7 +63,6 @@ This is one path to getting a lot of experience with the codebase, plus great interaction with the rest of the maintainer team, without necessarily taking on major coding tasks. - ## Time commitment Someone considering joining the issue triager team may be wondering: @@ -86,7 +83,6 @@ process, but for now we anticipate growing the team to about eight members (which is the size of the `Stackage` team as well), each of whom is likely to spend about two hours in total on upkeep work every eight weeks. - ## Issue and pull request interaction guidelines These guidelines apply to all members of the maintainer team. @@ -103,7 +99,6 @@ These guidelines apply to all members of the maintainer team. - If you know you’ll be unable to answer for a significant period of time, say so. Even better: ask someone else to take over from you. - ## Assessing feature requests and enhancement PRs **NB: this section is very likely to evolve over time as well.** @@ -158,14 +153,12 @@ With respect to assessing a PR's code, @snoyberg has outlined some into his projects which may be helpful to `Stack` triagers when performing reviews, as well. - ## Real-time communications At present, the maintainer team mostly communicates via a rather quiet channel -called [`#stack-collaborators`](../CONTRIBUTING/#slack-channel) on FP -Complete's Slack workspace, although we may migrate to some other platform in -the near future. - +called [`#stack-collaborators`](../CONTRIBUTING/#slack-channel) in the +Haskell Foundation's Slack workspace, although we may migrate to some other +platform in the future. ## Dealing with support issues @@ -177,7 +170,6 @@ maintainers team makes no guarantees about regularly checking them. *We may decide to offload support questions elsewhere in the future, but for now the most important thing is to direct users to a single destination.* - ## Issue vs pull request Sometimes it is ambiguous whether something should be opened as an issue to @@ -188,7 +180,6 @@ open a PR, it will _definitely_ take less time than opening an issue and describing the change you'd like to make. This logic can sometimes apply to minor code changes. Use your best judgement. - ## Issue closing policy We need to strike a balance in issue handling between keeping a maintainable