mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Change release process for 2.0

Browse source 
Tag release as soon as version bumps
No longer use release branch
Remove merge step as it is no longer needed.
This commit is contained in:
John Kleinschmidt 2018-02-12 11:01:50 -05:00
parent baced3152f
commit 12a8d90ef0
5 changed files with 24 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

19
docs/development/releasing.md
View file

@ -167,27 +167,10 @@ This release is published to [npm](https://www.npmjs.com/package/electron) under
1. You can run `npm run release -- --validateRelease` to verify that all of the
required files have been created for the release.
## Merge temporary branch
Once the release builds have finished, merge the `release` branch back into
the source release branch using the `merge-release` script.
If the branch cannot be successfully merged back this script will automatically
rebase the `release` branch and push the changes which will trigger the release
builds again, which means you will need to wait for the release builds to run
again before proceeding.
### Merging back into master
```sh
npm run merge-release -- master
```
### Merging back into old release branch
```sh
npm run merge-release -- 1-7-x
```
## Publish the release
Once the merge has finished successfully, run the `release` script
Once the release builds have finished, run the `release` script
via `npm run release` to finish the release process. This script will do the
following:
1. Build the project to validate that the correct version number is being released.