From 37bb5389f2c69c10616a476c700f0a493cbeff3d Mon Sep 17 00:00:00 2001 From: Benjamin Gerber Date: Wed, 6 Feb 2019 07:22:44 +0100 Subject: [PATCH 1/2] Improve doc for releases --- docs/developer-guide.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/developer-guide.md b/docs/developer-guide.md index 8e43bd386f5c..c8300aeaa6d6 100644 --- a/docs/developer-guide.md +++ b/docs/developer-guide.md @@ -270,12 +270,15 @@ fdescribe('...', function() { ### Create a package on npm ``` -git checkout master +git checkout git fetch origin -git reset --hard origin/master +git reset --hard origin/ ``` -Create a tag named the same as the version. +Where `` stand for `2.x`. + +Verify that the `` (`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 git push @@ -283,17 +286,16 @@ git push 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 " git push origin bump ``` -Do the pull request +Do the pull request on branch `` ### Create a new stabilisation branch From f305f715a679c0d0a93528b17937ca9aee9aa2d3 Mon Sep 17 00:00:00 2001 From: Benjamin Gerber Date: Wed, 6 Feb 2019 07:24:09 +0100 Subject: [PATCH 2/2] Correct version according to the doc (2.2.9) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0f1962cce3e8..9e1a9f157dd3 100644 --- a/package.json +++ b/package.json @@ -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"