Skip to content

Commit

Permalink
Merge pull request #4598 from camptocamp/bump
Browse files Browse the repository at this point in the history
Bump
  • Loading branch information
ger-benjamin authored Feb 6, 2019
2 parents e765ddc + f305f71 commit 60adb47
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 8 additions & 6 deletions docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -270,30 +270,32 @@ fdescribe('...', function() {
### Create a package on npm
```
git checkout master
git checkout <release-branch>
git fetch origin
git reset --hard origin/master
git reset --hard origin/<release-branche>
```
Create a tag named the same as the version.
Where `<release-branch>` stand for `2.x`.
Verify that the `<version>` (`2.x.x`) in package.json match with the tag you'll
create. Then create a tag named the same as the version.
```
git tag <version>
git push <version>
```
Travis will create a new package on npm.
If you create a new release, bump version in the package.json file:
```
git checkout -b bump
vi package.json
git add package.json
git commit -m "Bump version to 2.2.x+1"
git commit -m "Bump version to <version + 1>"
git push origin bump
```
Do the pull request
Do the pull request on branch `<release-branche>`
### Create a new stabilisation branch
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ngeo",
"version": "2.2.8",
"version": "2.2.9",
"description": "AngularJS OpenLayers Library",
"scripts": {
"prepublish": "make -f npm.mk install"
Expand Down

0 comments on commit 60adb47

Please sign in to comment.