Append dev version bump to release branch
+8
-10
@@ -43,15 +43,15 @@ Commit the version changes:
|
|||||||
git add package.json package-lock.json
|
git add package.json package-lock.json
|
||||||
git commit -m 'Update package version to 3.1.0'
|
git commit -m 'Update package version to 3.1.0'
|
||||||
|
|
||||||
### Merge the release branch
|
### Pull request
|
||||||
|
|
||||||
Create a pull request and merge the release branch. This allows for any final review of upgrade notes or other parts of the changelog.
|
Create a pull request for the release branch. This allows for any final review of upgrade notes or other parts of the changelog. Do not merge yet!
|
||||||
|
|
||||||
### Tag
|
### Tag
|
||||||
|
|
||||||
Tag the release. In a working copy of the openlayers/openlayers repo:
|
Tag the release:
|
||||||
|
|
||||||
# tag the latest from openlayers/master
|
# tag the latest from openlayers/release-v3.1.0
|
||||||
git tag -a v3.1.0 -m '3.1.0'
|
git tag -a v3.1.0 -m '3.1.0'
|
||||||
|
|
||||||
# push the tag
|
# push the tag
|
||||||
@@ -65,11 +65,7 @@ Run the `publish.sh` task with the version number as specified in the `package.j
|
|||||||
|
|
||||||
### Bump the patch version number
|
### Bump the patch version number
|
||||||
|
|
||||||
This is to allow users to update to ol@dev seamlessly. Create a branch:
|
This is to allow users to update to ol@dev seamlessly. Edit `package.json` and bump the patch version number, e.g.
|
||||||
|
|
||||||
git checkout openlayers/master -b dev-3.1.1
|
|
||||||
|
|
||||||
edit `package.json` and bump the patch version number, e.g.
|
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"name": "openlayers",
|
"name": "openlayers",
|
||||||
@@ -85,7 +81,9 @@ Commit and push this change:
|
|||||||
git add package.json package-lock.json
|
git add package.json package-lock.json
|
||||||
git commit -m "Develop on 3.1.1"
|
git commit -m "Develop on 3.1.1"
|
||||||
|
|
||||||
Create a pull request, review the changes, and merge the branch.
|
### Merge the release branch
|
||||||
|
|
||||||
|
Push the pending changes to the release branch and merge it into master.
|
||||||
|
|
||||||
### Update website
|
### Update website
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user