diff --git a/CHANGELOG.md b/CHANGELOG.md index 2834fa70..30de4cd9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,11 @@ This project adheres to [Semantic Versioning](https://semver.org/). ❤️ **Donate:** Enjoying MagicMirror²? [Please consider a donation!](https://magicmirror.builders/#donate) With your help we can continue to improve the MagicMirror². -## [2.29.0] - Unreleased (`develop` branch) +## [2.29.0] - 2024-10-01 -_This release is scheduled to be released on 2024-10-01._ +Thanks to: @bugsounet, @dkallen78, @jargordon, @khassel, @KristjanESPERANTO, @MarcLandis, @rejas, @ryan-d-williams, @sdetweil, @skpanagiotis. + +> ⚠️ This release needs nodejs version `v20` or `v22`, minimum version is `v20.9.0` ### Added diff --git a/Collaboration.md b/Collaboration.md index 6d2da4d6..a0c64bd9 100644 --- a/Collaboration.md +++ b/Collaboration.md @@ -15,24 +15,44 @@ This document describes how collaborators of this repository should work togethe ## Releases -Are done by @rejas or @khassel. +Are done by + +- [ ] @rejas +- [ ] @sdetweil +- [ ] @khassel + +### Pre-Deployment steps + +- [ ] update dependencies (a few days before) ### Deployment steps -- pull latest `develop` branch -- update `package.json` to reflect correct version number -- run `npm install` to generate new `package-lock.json` -- test `develop` branch -- update `CHANGELOG.md` (don't forget to add all contributor names) -- commit and push all changes -- after successful test run via github actions: create pull request to `master` branch -- after PR tests run without issues, merge PR -- create new release with corresponding version tag -- publish release notes with link to github release on forum in new locked topic +- [ ] 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 `v20` or `v22`, minimum version is `v20.9.0` +- [ ] commit and push all changes +- [ ] 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` + - [ ] description of the PR is the section of the `CHANGELOG.md` +- [ ] after PR tests run without issues, merge PR +- [ ] create new release with + - [ ] corresponding version tag `v2.xx.0` + - [ ] a release name: `...` + - [ ] description of the PR is the section of the `CHANGELOG.md` ### Draft new development release -- checkout `develop` branch -- update `package.json` to reflect correct version number `2.xx.0-develop` -- draft new section in `CHANGELOG.md` -- commit and publish `develop` branch +- [ ] checkout `develop` branch +- [ ] update `package.json` and `package-lock.json` to reflect correct version number `2.xx.0-develop` +- [ ] draft new section in `CHANGELOG.md` +- [ ] commit and publish `develop` branch + +### After release + +- [ ] publish release notes with link to github release on forum in new locked topic +- [ ] close all issues with label `ready (coming with next release)` +- [ ] release new documentation by merging `develop` on `master` in documentation repository diff --git a/package-lock.json b/package-lock.json index 89d93e52..e79a681f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "magicmirror", - "version": "2.29.0-develop", + "version": "2.29.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "magicmirror", - "version": "2.29.0-develop", + "version": "2.29.0", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 7aa3bdae..7b80b4e2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "magicmirror", - "version": "2.29.0-develop", + "version": "2.29.0", "description": "The open source modular smart mirror platform.", "keywords": [ "magic mirror",