diff --git a/RELEASING.md b/RELEASING.md index 95206737c..f35b4ee66 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -73,8 +73,8 @@ Always maintain changelogs in main branch (not in release branches). 1. create release branch when needed:\ `git branch MAJORVER-branch BRANCHPOINT`\ - When convenient, the first major release can be tagged on master (`1.22`), - and the release branch (`1.22-branch`) gets created when there's a followup minor release:\ + Sometimes, we make the major release tag (`1.22`) on master, + and create a release branch (`1.22-branch`) when there's a followup minor release:\ `git branch 1.22-branch 1.22` 1. update changelogs in main @@ -82,7 +82,7 @@ Always maintain changelogs in main branch (not in release branches). 1. review changes so far, estimate which packages will be released 1. cherry pick changes to release - - cherry pick minor-release-worthy commits + - cherry pick release-worthy commits - from: magit, `l o X.Y..master`, `M-x magit-toggle-buffer-lock`, `C-x D` (`M-x toggle-window-dedicated`) - to: magit, `l o master..X.Y`, `M-x magit-toggle-buffer-lock`, `C-x D` @@ -97,7 +97,7 @@ Always maintain changelogs in main branch (not in release branches). - finalise [changelogs](#changelogs) in main, copy to changelogs in release branch -- `./Shake.hs` to update `Shake` and review release tasks +- `./Shake.hs` to update `Shake` and review release tasksm - `./Shake setversion VER [-c]` (first without `-c` to review, then with `-c` to commit). Also `touch hledger/Hledger/Cli/Version.hs` ? diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index bf7293a71..5c1a6d9eb 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -21,7 +21,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4 +tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 extra-source-files: - CHANGES.md diff --git a/hledger-ui/package.yaml b/hledger-ui/package.yaml index 4269f455d..fbf2ca163 100644 --- a/hledger-ui/package.yaml +++ b/hledger-ui/package.yaml @@ -21,7 +21,7 @@ github : simonmichael/hledger homepage : http://hledger.org bug-reports : http://bugs.hledger.org stability : stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4 +tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 extra-source-files: - CHANGES.md diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index 6c82daf6c..33aea04fe 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -22,7 +22,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.8.4, GHC==8.10.4 +tested-with: GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 extra-source-files: - CHANGES.md diff --git a/hledger/package.yaml b/hledger/package.yaml index 14044d253..44b100dfe 100644 --- a/hledger/package.yaml +++ b/hledger/package.yaml @@ -21,7 +21,7 @@ github: simonmichael/hledger homepage: http://hledger.org bug-reports: http://bugs.hledger.org stability: stable -tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4 +tested-with: GHC==8.6.5, GHC==8.8.4, GHC==8.10.4, GHC==9.0.1 extra-source-files: - CHANGES.md