add more releasing tips
This commit is contained in:
parent
c6289ef219
commit
404589d9b5
1 changed files with 18 additions and 3 deletions
|
@ -2,11 +2,25 @@
|
||||||
|
|
||||||
This document describes the process for releasing a new version of Electron.
|
This document describes the process for releasing a new version of Electron.
|
||||||
|
|
||||||
|
## Create a backport branch
|
||||||
|
|
||||||
|
If you're about release a new major or minor version of Electron like `1.8.0`,
|
||||||
|
`1.9.0`, or `2.0.0`, first create a branch of `master` for later backports:
|
||||||
|
|
||||||
|
Assuming you're about to publish `1.8.0`:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
git checkout master
|
||||||
|
git pull
|
||||||
|
git checkout -b 1-7-x
|
||||||
|
git push origin HEAD
|
||||||
|
```
|
||||||
|
|
||||||
## Create a temporary branch
|
## Create a temporary branch
|
||||||
|
|
||||||
Create a new branch from `master`. Name it `release` or anything you like.
|
Create a new branch from `master`. Name it `release` or anything you like.
|
||||||
|
|
||||||
Note: If you are creating a backport release, you'll check out `1-6-x`, `1-7-x`, etc instead of `master`.
|
Note: If you are creating a backport release, you'll check out `1-6-x`, `1-7-x`, etc instead of `master`.
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git checkout master
|
git checkout master
|
||||||
|
@ -126,10 +140,11 @@ This release is published to [npm](https://www.npmjs.com/package/electron) under
|
||||||
|
|
||||||
## Merge temporary branch
|
## Merge temporary branch
|
||||||
|
|
||||||
Merge the temporary back into master, without creating a merge commit:
|
Merge the temporary branch back into master, without creating a merge commit:
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
git merge release master --no-commit
|
git checkout master
|
||||||
|
git merge release --no-commit
|
||||||
git push origin master
|
git push origin master
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue