diff --git a/smos-calendar-import/package.yaml b/smos-calendar-import/package.yaml index 19ffb0056..e9afc0c2a 100644 --- 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 index aebce4d21..80419a98e 100644 --- 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 new file mode 100644 index 000000000..3bacf1d9c --- /dev/null +++ b/smos-docs-site/content/changelogs/2022-11-11.markdown @@ -0,0 +1,21 @@ +- [smos 0.6.1](#smos-0.6.1) +- [smos-calendar-import 0.6.1](#smos-calendar-import-0.6.1) +- [smos-scheduler 0.6.0](#smos-scheduler-0.6.0) +- [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 index 2975d9d71..0784b7d46 100644 --- 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 index 2e74db894..e69de29bb 100644 --- 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 index d0278a2de..68ba56dc4 100644 --- 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 index ed4fd29e5..c706e4224 100644 --- 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 index 35d15c603..59a742052 100644 --- 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 index 3ba0ff9db..74db4bb38 100644 --- 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 index 2ed5af9b0..6f7a59b36 100644 --- 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 index b5f9bc5ed..7a02b619c 100644 --- 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 index 6cb28544d..f488cc1e1 100644 --- 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