Skip to content

Commit

Permalink
Merge pull request #3166 from CSCfi/release-2.33
Browse files Browse the repository at this point in the history
Release 2.33
  • Loading branch information
aatkin authored Jun 19, 2023
2 parents 58e3385 + 1a5d2d8 commit 58d6fd7
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ have notable changes.

## Unreleased

Changes since v2.32
Changes since v2.33

## v2.33 "Santakuja" 2023-06-19

### Additions
- PDF output can be customized a little. This enables changing the font, which should fix missing diacritics. (#3158)
Expand Down
22 changes: 14 additions & 8 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,24 @@ Releases can be found on the github [release page](https://github.com/CSCfi/rems

`git fetch; git checkout origin/master`

2. Edit CHANGELOG.md:
2. Update changelog and version number:

- See the name of the previous release, find the street with that name,
select a street that is next to that street but is not yet used as
a release name.
1. Edit CHANGELOG.md:

- Add a line for the new release, e.g.,
`## v2.6 "Kalevalantie" 2018-11-12`
- See the name of the previous release, find the street with that name,
select a street that is next to that street but is not yet used as
a release name.

- Move all changes from under `## Unreleased` to under the new release
- Add a line for the new release, e.g.,
`## v2.6 "Kalevalantie" 2018-11-12`

- Leave `Changes since v[x.y]` text under `## Unreleased`
- Move all changes from under `## Unreleased` to under the new release

- Leave `Changes since v[x.y]` text under `## Unreleased`

2. Edit the first line in project.clj:

`(defproject rems "2.33" ...)`

3. Create a pull request for those changes (e.g. branch `release-2.6` with commit `release: v2.6`)

Expand Down
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject rems "2.32"
(defproject rems "2.33"
:description "Resource Entitlement Management System is a tool for managing access rights to resources, such as research datasets."
:url "https://github.com/CSCfi/rems"

Expand Down

0 comments on commit 58d6fd7

Please sign in to comment.