Release candidate

NorfairKing · Nov 11, 2022 · ce01f19 · ce01f19
1 parent a1788ca
commit ce01f19
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 25 deletions.
diff --git a/smos-calendar-import/package.yaml b/smos-calendar-import/package.yaml
@@ -1,5 +1,5 @@
 name: smos-calendar-import
-version: 0.6.0
+version: 0.6.1
 category: Smos
 author: Tom Sydney Kerckhove
 maintainer: syd@cs-syd.eu

diff --git a/smos-calendar-import/smos-calendar-import.cabal b/smos-calendar-import/smos-calendar-import.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           smos-calendar-import
-version:        0.6.0
+version:        0.6.1
 category:       Smos
 author:         Tom Sydney Kerckhove
 maintainer:     syd@cs-syd.eu

diff --git a/smos-docs-site/content/changelogs/2022-11-11.markdown b/smos-docs-site/content/changelogs/2022-11-11.markdown
@@ -0,0 +1,21 @@
+- <a name="smos-0.6.1">[smos 0.6.1](#smos-0.6.1)
+- <a name="smos-calendar-import-0.6.1">[smos-calendar-import 0.6.1](#smos-calendar-import-0.6.1)
+- <a name="smos-scheduler-0.6.0">[smos-scheduler 0.6.0](#smos-scheduler-0.6.0)
+- <a name="smos-server-0.10.1">[smos-server 0.10.1](#smos-server-0.10.1)
+
+### Changed
+
+* `smos-scheduler`:
+  When a rent recurrence schedule is activated the first time, it is activated
+  as if the current time is the time it would have been activated next.
+
+* Home manager module: The `workflowDir` option is now put into the smos config
+  file, instead of only used for the backup script.
+
+* `smos-server`:
+  Use the default compression level (3) for compressing backups instead of the
+  maximum level (24).
+
+* `smos`:
+  Fixed a bug in which the directory could not be switched if the target had
+  the same contents (empty) as the currently selected directory.
diff --git a/smos-docs-site/content/pages/development/release-checklist.markdown b/smos-docs-site/content/pages/development/release-checklist.markdown
@@ -10,8 +10,9 @@ When a given commit on the `development` branch is supposedly ready for release,
 1. Make sure that the version number of the API has been changed if the API has been changed.
 1. Add new release section in the changelog.
 1. Run `nix-shell --run 'stack runhaskell scripts/gen-changelog-release-section.hs'` to add all the version numbers to the changelog.
-1. Make sure that CI passes, remotely as well as with `ci.nix`.
+1. Make sure that CI passes locally using `nix-build ci.nix`.
 1. Make a release candidate commit.
+1. Make sure that CI passes remotely.
 1. Merge `development` into `release`.
 1. Run the release script to create the appropriate tags: `nix-shell --run 'stack runhaskell scripts/make-release-tags.hs'`.
 1. Push to github with `git push`.

diff --git a/smos-docs-site/content/unreleased.markdown b/smos-docs-site/content/unreleased.markdown
@@ -1,16 +0,0 @@
-### Changed
-
-* `smos-scheduler`:
-  When a rent recurrence schedule is activated the first time, it is activated
-  as if the current time is the time it would have been activated next.
-
-* Home manager module: The `workflowDir` option is now put into the smos config
-  file, instead of only used for the backup script.
-
-* `smos-server`:
-  Use the default compression level (3) for compressing backups instead of the
-  maximum level (24).
-
-* `smos`:
-  Fixed a bug in which the directory could not be switched if the target had
-  the same contents (empty) as the currently selected directory.

diff --git a/smos-docs-site/smos-docs-site.cabal b/smos-docs-site/smos-docs-site.cabal
@@ -48,6 +48,7 @@ extra-source-files:
     content/changelogs/2022-07-22.markdown
     content/changelogs/2022-08-20.markdown
     content/changelogs/2022-09-26.markdown
+    content/changelogs/2022-11-11.markdown
     content/pages/blogposts.markdown
     content/pages/building-installation.markdown
     content/pages/cheat-sheet.markdown

diff --git a/smos-scheduler/package.yaml b/smos-scheduler/package.yaml
@@ -1,5 +1,5 @@
 name: smos-scheduler
-version: 0.5.0
+version: 0.6.0
 category: Smos
 author: Tom Sydney Kerckhove
 maintainer: syd@cs-syd.eu

diff --git a/smos-scheduler/smos-scheduler.cabal b/smos-scheduler/smos-scheduler.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           smos-scheduler
-version:        0.5.0
+version:        0.6.0
 category:       Smos
 author:         Tom Sydney Kerckhove
 maintainer:     syd@cs-syd.eu

diff --git a/smos-server/package.yaml b/smos-server/package.yaml
@@ -1,5 +1,5 @@
 name: smos-server
-version: 0.10.0
+version: 0.10.1
 category: Smos
 author: Tom Sydney Kerckhove
 maintainer: syd@cs-syd.eu

diff --git a/smos-server/smos-server.cabal b/smos-server/smos-server.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           smos-server
-version:        0.10.0
+version:        0.10.1
 category:       Smos
 author:         Tom Sydney Kerckhove
 maintainer:     syd@cs-syd.eu

diff --git a/smos/package.yaml b/smos/package.yaml
@@ -1,5 +1,5 @@
 name: smos
-version: 0.6.0
+version: 0.6.1
 category: Smos
 author: Tom Sydney Kerckhove
 maintainer: syd@cs-syd.eu

diff --git a/smos/smos.cabal b/smos/smos.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           smos
-version:        0.6.0
+version:        0.6.1
 category:       Smos
 author:         Tom Sydney Kerckhove
 maintainer:     syd@cs-syd.eu