From 8a7cf9cdd565f2b7c6aa05f520e947dde03cb7dd Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Wed, 1 Jan 2025 08:51:10 -0600 Subject: [PATCH 1/2] start 2.31.0 release --- CHANGELOG.md | 22 ++++++++++++++++++++++ Collaboration.md | 1 + package-lock.json | 4 ++-- package.json | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f3af9014b..2c8475251c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,28 @@ 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 + +planned for 2025-04-01 + +> ⚠️ This release needs nodejs version `v20` or `v22 or higher`, minimum version is `v20.18.1` + +### Added + + +### Changed + + +### Removed + + +### Updated + + +### Fixed + + + ## [2.30.0] - 2025-01-01 Thanks to: @xsorifc28, @HeikoGr, @bugsounet, @khassel, @KristjanESPERANTO, @rejas, @sdetweil. diff --git a/Collaboration.md b/Collaboration.md index d2adfc9050..bfcfc0061e 100644 --- a/Collaboration.md +++ b/Collaboration.md @@ -37,6 +37,7 @@ Are done by - [ ] add min. node version: > ⚠️ This release needs nodejs version `v20` or `v22`, minimum version is `v20.9.0` - [ ] 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` - [ ] 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 31dea2bc8b..4a204a1ea8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "magicmirror", - "version": "2.30.0", + "version": "2.31.0-develop", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "magicmirror", - "version": "2.30.0-develop", + "version": "2.31.0-develop", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 366d4b242d..90016705be 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.30.0", + "version": "2.31.0-develop", "description": "The open source modular smart mirror platform.", "keywords": [ "magic mirror", From 0771e980e97d5668cb8aa2511f6aa13c1e57bbaa Mon Sep 17 00:00:00 2001 From: sam detweiler Date: Wed, 1 Jan 2025 08:58:13 -0600 Subject: [PATCH 2/2] fixed typo --- CHANGELOG.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c8475251c..2b58882f6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,20 +15,14 @@ planned for 2025-04-01 ### Added - ### Changed - ### Removed - ### Updated - ### Fixed - - ## [2.30.0] - 2025-01-01 Thanks to: @xsorifc28, @HeikoGr, @bugsounet, @khassel, @KristjanESPERANTO, @rejas, @sdetweil.