kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-07-04 14:47:20 +00:00
Code Issues Projects Releases Wiki Activity

update Collaboration.md (added infos from discord) (#3408)

Browse Source
This commit is contained in:
Karsten Hassel 2024-03-30 23:29:57 +01:00 committed by GitHub
parent e004b33fab
commit 72ef8235b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -26,10 +26,10 @@ _This release is scheduled to be released on 2024-04-01._
- Update pm2 to v5.3.1 with no allow-ghsas (#3364) - Update pm2 to v5.3.1 with no allow-ghsas (#3364)
- [chore] Update husky and let lint-staged fix ESLint issues - [chore] Update husky and let lint-staged fix ESLint issues
- [chore] Update dependencies including electron to v29 (#3357) and node-ical - [chore] Update dependencies including electron to v29 (#3357) and node-ical
- Updated translations for estonian (#3371) - Update translations for estonian (#3371)
- Update electron to v29 and update other dependencies - Update electron to v29 and update other dependencies
- [calendar] fullDay events over several days now show the left days from the first day on and 'today' on the last day - [calendar] fullDay events over several days now show the left days from the first day on and 'today' on the last day
- Updated layout of current weather indoor values - Update layout of current weather indoor values
### Fixed ### Fixed

22
Collaboration.md
View File

@ -5,7 +5,7 @@ This document describes how collaborators of this repository should work togethe
- never merge your own PR's - never merge your own PR's
- never merge without someone having approved (approving and merging from same person is allowed) - never merge without someone having approved (approving and merging from same person is allowed)
- wait for all approvals requested (or the author decides something different in the comments) - wait for all approvals requested (or the author decides something different in the comments)
- never merge to `master`, except for releases (because of update notification) - merge to `master` only for releases or other urgent issues (update notification is only triggered by tags)
- merges to master should be tagged with the "mastermerge" label so that the test runs through - merges to master should be tagged with the "mastermerge" label so that the test runs through
## Issues ## Issues
@ -16,3 +16,23 @@ This document describes how collaborators of this repository should work togethe
## Releases ## Releases
Are done by @rejas or @khassel. Are done by @rejas or @khassel.
### 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
### 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