diff --git a/docs/v2/release-process.md b/docs/v2/release-process.md index 83f4db8ce2..6e30aa74cf 100644 --- a/docs/v2/release-process.md +++ b/docs/v2/release-process.md @@ -14,7 +14,7 @@ git fetch && git checkout develop && git reset --hard origin/develop Change "Unreleased" header in `CHANGELOG.md` to ` - ` -## Create release branch: +## Create release branch `git checkout -b release/` @@ -37,6 +37,7 @@ Jenkins will - merge with master branch - build and deploy everything - set the new development version for the develop branch +- delete the release branch ## Make a party @@ -44,7 +45,7 @@ Jenkins will To release a new version of a Plugin for SCM-Manager v2 you have to do the following steps (replace placeholder `` accordingly, eg. with `2.1.0`): -## Update to latest version +## Check out default branch Make sure you have no changes you want to keep! @@ -52,20 +53,6 @@ Make sure you have no changes you want to keep! git fetch && git checkout develop && git reset --hard origin/develop ``` -## Set new version - -Edit `pom.xml`: - -- `version` and `scm.tag` have to be set to the new version. -- ensure that all dependencies to other scm resources have released versions -- ensure `parent.version` points to stable release - -Edit `package.json`: - -- `version` has to be set to the new version. -- ensure that all dependencies to other scm resources have released versions -- ensure the version of `@scm-manager/ui-plugins` points to the same version as `parent.version` in the `pom.xml` - ## Modify Changelog Change "Unreleased" header in `CHANGELOG.md` to ` - ` @@ -78,42 +65,34 @@ Change "Unreleased" header in `CHANGELOG.md` to ` - ` `mvn clean install` +## Create release branch + +``` +git checkout -b release/ +``` + ## Commit and push release ``` git commit -am "Release version " -git push origin develop ``` -## Merge with master branch - -The merge should be possible with a fast forward. If this fails, check for changes on the `master` branch that are not present on the `develop` branch. Merge these changes into the `develop` branch, first! +## Push release branch ``` -git checkout master && git pull && git merge develop --ff-only && git push origin master +git push origin release/ ``` -## Create and push tag +## Wait for Jenkins build -``` -git tag -s -a -m "" -git push --tags origin -``` +Jenkins will -## Prepare next development version +- update versions in pom.xml and package.json +- merge with master branch +- build and deploy everything +- set the new development version for the develop branch +- delete the release branch -``` -git checkout develop -``` - -Edit `pom.xml`: `version` has to be set to the new development version, `tag` to `HEAD`. - -Edit `package.json`: `version` has to be set to the new development version. - -``` -git commit -am "Prepare for next development iteration" -git push origin develop -``` ## Attention: Creating new plugins If you are creating a new plugin which doesn't exist in the SCM-Manager Plugin-Center yet, your plugin will not be shown after the release. First you have to create a `index.md` in the Plugin-Center Repository.