diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d0d270..1a2eee1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/#donate) With your help we can continue to improve the MagicMirror². -## [2.31.0-develop] - unreleased +## [2.31.0] - 2025-04-01 -planned for 2025-04-01 +Thanks to: @Developer-Incoming, @eltociear, @geraki, @khassel, @KristjanESPERANTO, @MagMar94, @mixasgr, @n8many, @OWL4C, @rejas, @savvadam, @sdetweil. > ⚠️ This release needs nodejs version `v22.14.0 or higher` @@ -1720,6 +1720,7 @@ It includes (but is not limited to) the following features: This was part of the blogpost: [https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the](https://michaelteeuw.nl/post/83916869600/magic-mirror-part-vi-production-of-the) +[2.31.0]: https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.30.0...v2.31.0 [2.30.0]: https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.29.0...v2.30.0 [2.29.0]: https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.28.0...v2.29.0 [2.28.0]: https://github.com/MagicMirrorOrg/MagicMirror/compare/v2.27.0...v2.28.0 diff --git a/Collaboration.md b/Collaboration.md index 31dd855d..435f1367 100644 --- a/Collaboration.md +++ b/Collaboration.md @@ -30,14 +30,16 @@ Are done by ### Deployment steps - [ ] pull latest `develop` branch -- [ ] update `package.json` and `package-lock.json` to reflect correct version number `2.xx.0` -- [ ] test `develop` branch -- [ ] update `CHANGELOG.md` - - [ ] add all contributor names: `...` - - [ ] add min. node version: > ⚠️ This release needs nodejs version `v22.14.0` or higher - - [ ] check release link at the bottom of the file -- [ ] commit and push all changes -- [ ] after successful test run via github actions: merge pull request to `develop` +- [ ] create `prep-release` branch from `develop` + - [ ] update `package.json` and `package-lock.json` to reflect correct version number `2.xx.0` + - [ ] test `prep-release` branch + - [ ] update `CHANGELOG.md` + - [ ] add all contributor names: `...` + - [ ] add min. node version: > ⚠️ This release needs nodejs version `v22.14.0` or higher + - [ ] check release link at the bottom of the file + - [ ] commit and push all changes + - [ ] create pull request from `prep-release` to `develop` branch with title `Prepare Release 2.xx.0` + - [ ] after successful test run via github actions: merge pull request to `develop` - [ ] after successful test run via github actions: create pull request from `develop` to `master` branch - [ ] add label `mastermerge` - [ ] title of the PR is `Release 2.xx.0` diff --git a/package-lock.json b/package-lock.json index da455afb..69eb8ed4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "magicmirror", - "version": "2.31.0-develop", + "version": "2.31.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "magicmirror", - "version": "2.31.0-develop", + "version": "2.31.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 66dee437..b97e604e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.31.0-develop", + "version": "2.31.0", "description": "The open source modular smart mirror platform.", "keywords": [ "magic mirror",