NorfairKing/smos
1
1
Fork 0
mirror of https://github.com/NorfairKing/smos.git synced 2024-10-04 04:07:15 +03:00
Code Issues Projects Releases Wiki Activity

Release candidate

Browse Source
This commit is contained in:
Tom Sydney Kerckhove 2022-09-26 22:02:40 +02:00
parent 4680517e6b
commit cf1669f353
19 changed files with 40 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
smos-calendar-import/package.yaml
View File

@ -1,5 +1,5 @@
name: smos-calendar-import
version: 0.5.0
version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos-calendar-import/smos-calendar-import.cabal
View File

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

24
smos-docs-site/content/changelogs/2022-09-26.markdown Normal file
View File

@ -0,0 +1,24 @@
- <a name="smos-0.6.0">[smos 0.6.0](#smos-0.6.0)
- <a name="smos-calendar-import-0.6.0">[smos-calendar-import 0.6.0](#smos-calendar-import-0.6.0)
- <a name="smos-query-0.8.0">[smos-query 0.8.0](#smos-query-0.8.0)
- <a name="smos-scheduler-0.5.0">[smos-scheduler 0.5.0](#smos-scheduler-0.5.0)
- <a name="smos-server-0.10.0">[smos-server 0.10.0](#smos-server-0.10.0)
- <a name="smos-web-server-0.9.0">[smos-web-server 0.9.0](#smos-web-server-0.9.0)
### Added
* The home manager module now does a config check for `smos-query`, `smos-scheduler` and `smos-notify` during activation.
* The home manager module now does an extra local backup during activation.
* Editor integration: You can now use `vim` or `emacs` to edit the contents of an entry.
* Sandbox mode, so the editor integration cannot do damage in the web version.
### Changed
* All packages: Upgraded to `lts-19.6` and nixpkgs branch `nixos-22.05`
* `smos-scheduler`: Allow the schedule template to be specified as an absolute path as well.
* `smos-query`: Fixed that the agenda entries in smos-query had incorrect
pretty relative days for timestamps with a day-level granularity.
* `smos-query`: Improved metavars for optparse documentation.
* `smos-web-server`: Change the `TUIR` and `TUIInstanceR` routes to not accept any path.
* `smos-web-server`: Use `playground.smos` in the playground instead of `example.smos`.
* `smos-web-server`: Open the editor in the workflow directory by default, instead of `example.smos`.

4
smos-docs-site/content/pages/development/release-checklist.markdown
View File

@ -9,11 +9,11 @@ When a given commit on the `development` branch is supposedly ready for release,
1. Make sure that the version number of the data format has been changed if the data format has been changed.
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 `stack runhaskell scripts/gen-changelog-release-section.hs` to add all the version numbers to 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 a release candidate commit.
1. Merge `development` into `release`.
1. Run the release script to create the appropriate tags: `stack runhaskell scripts/make-release-tags.hs`.
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`.
1. Push the tags with `git push --tags`
1. Make a GitHub release with the contents of the changelog using `nix-shell --run ./scripts/make-github-release.sh`.

16
smos-docs-site/content/unreleased.markdown
View File

@ -1,16 +0,0 @@
### Added
* The home manager module now does a config check for `smos-query`, `smos-scheduler` and `smos-notify` during activation.
* The home manager module now does an extra local backup during activation.
* Editor integration: You can now use `vim` or `emacs` to edit the contents of an entry.
* Sandbox mode, so the editor integration cannot do damage in the web version.
### Changed
* `smos-scheduler`: Allow the schedule template to be specified as an absolute path as well.
* `smos-query`: Fixed that the agenda entries in smos-query had incorrect
pretty relative days for timestamps with a day-level granularity.
* `smos-query`: Improved metavars for optparse documentation.
* `smos-web-server`: Change the `TUIR` and `TUIInstanceR` routes to not accept any path.
* `smos-web-server`: Use `playground.smos` in the playground instead of `example.smos`.
* `smos-web-server`: Open the editor in the workflow directory by default, instead of `example.smos`.

1
smos-docs-site/smos-docs-site.cabal
View File

@ -47,6 +47,7 @@ extra-source-files:
content/changelogs/2022-06-27.markdown
content/changelogs/2022-07-22.markdown
content/changelogs/2022-08-20.markdown
content/changelogs/2022-09-26.markdown
content/pages/blogposts.markdown
content/pages/building-installation.markdown
content/pages/cheat-sheet.markdown

2
smos-query/package.yaml
View File

@ -1,5 +1,5 @@
name: smos-query
version: 0.7.4
version: 0.8.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos-query/smos-query.cabal
View File

@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-query
version: 0.7.4
version: 0.8.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos-scheduler/package.yaml
View File

@ -1,5 +1,5 @@
name: smos-scheduler
version: 0.4.0
version: 0.5.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos-scheduler/smos-scheduler.cabal
View File

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

2
smos-server/package.yaml
View File

@ -1,5 +1,5 @@
name: smos-server
version: 0.9.1
version: 0.10.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos-server/smos-server.cabal
View File

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

3
smos-web-server/package.yaml
View File

@ -1,5 +1,5 @@
name: smos-web-server
version: 0.8.0
version: 0.9.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
@ -28,7 +28,6 @@ library:
- data-default
- deepseq
- envparse
- filepath
- http-client
- http-client-tls
- http-types

3
smos-web-server/smos-web-server.cabal
View File

@ -5,7 +5,7 @@ cabal-version: 1.12
-- see: https://github.com/sol/hpack
name: smos-web-server
version: 0.8.0
version: 0.9.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu
@ -92,7 +92,6 @@ library
, data-default
, deepseq
, envparse
, filepath
, http-client
, http-client-tls
, http-types

1
smos-web-server/src/Smos/Web/Server/Foundation.hs
View File

@ -36,7 +36,6 @@ import Smos.Web.Server.Constants
import Smos.Web.Server.Static
import Smos.Web.Server.Widget
import Smos.Web.Style
import qualified System.FilePath as FP
import Text.Hamlet
import Yesod
import Yesod.Auth

1
smos-web-server/src/Smos/Web/Server/Handler/TUI.hs
View File

@ -8,7 +8,6 @@ module Smos.Web.Server.Handler.TUI
)
where
import qualified Data.Text as T
import Smos.Web.Server.Handler.Import
getTUIR :: Handler Html

2
smos/package.yaml
View File

@ -1,5 +1,5 @@
name: smos
version: 0.5.2
version: 0.6.0
category: Smos
author: Tom Sydney Kerckhove
maintainer: syd@cs-syd.eu

2
smos/smos.cabal
View File

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

2
smos/test_resources/e2e/conv-done-and-wait-for-response-undo.yaml
View File

@ -2,6 +2,6 @@ before:
- hello
commands:
- ' nw'
- 'u'
- 'u'
after:
- hello