From c113708132f86316e8d37f3ae07bcb40ecf80fd4 Mon Sep 17 00:00:00 2001 From: Bartosz Date: Mon, 8 Jun 2026 16:45:04 +0200 Subject: [PATCH] docs: branch release flow off develop and merge into master Update RELEASING.md so releases start from develop and add the step to merge develop into master and push before tagging and publishing. --- RELEASING.md | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index 2d84c21..d258810 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -1,13 +1,14 @@ # Releasing -1. Create branch `release/X.Y.Z` from `master`. +1. Create branch `release/X.Y.Z` from `develop`. 2. Update `version` in `package.json` to the new version 3. Run `npm install` (to refresh `package-lock.json`) 4. Update the `CHANGELOG.md` for the impending release 5. `git commit -am "release X.Y.Z"` (where X.Y.Z is the new version) -6. Push to Github, make PR to the `master` branch, and when approved, merge. -7. Make a release on Github from the `master` branch, specify tag as `vX.Y.Z` to create a tag. -8. `git checkout master && git pull` -9. Clean unversioned files: `git clean -fdx dist` -10. `npm run build && npm pack` to verify the package -11. `npm publish` +6. Push to Github, make PR to the `develop` branch, and when approved, merge. +7. Pull latest `develop`, merge it into `master`, and push `master` to `origin`. +8. Make a release on Github from the `master` branch, specify tag as `vX.Y.Z` to create a tag. +9. `git checkout master && git pull` +10. Clean unversioned files: `git clean -fdx dist` +11. `npm run build && npm pack` to verify the package +12. `npm publish`