Repository: incubator-edgent Updated Branches: refs/heads/develop 409d48b76 -> ff1e22cb7
minor releaseing.adoc updates Project: http://git-wip-us.apache.org/repos/asf/incubator-edgent/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-edgent/commit/b6b22109 Tree: http://git-wip-us.apache.org/repos/asf/incubator-edgent/tree/b6b22109 Diff: http://git-wip-us.apache.org/repos/asf/incubator-edgent/diff/b6b22109 Branch: refs/heads/develop Commit: b6b22109b05586c7b0b6c9cc2eade586de654606 Parents: ae28b03 Author: Dale LaBossiere <dlab...@us.ibm.com> Authored: Sat Feb 3 09:05:29 2018 -0500 Committer: Dale LaBossiere <dlab...@us.ibm.com> Committed: Sat Feb 3 09:05:29 2018 -0500 ---------------------------------------------------------------------- src/site/asciidoc/releasing.adoc | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-edgent/blob/b6b22109/src/site/asciidoc/releasing.adoc ---------------------------------------------------------------------- diff --git a/src/site/asciidoc/releasing.adoc b/src/site/asciidoc/releasing.adoc index 144e732..95852b6 100644 --- a/src/site/asciidoc/releasing.adoc +++ b/src/site/asciidoc/releasing.adoc @@ -101,7 +101,7 @@ Create the release branch: Notes: -* -DbranchName : the name of the release branch +* -DbranchName : the name of the release branch - release/<major>.<minor> * -DautoVersionSubmodules : all children modules inherit the the top level pom's version * -P platform-android,... : these profiles are required so that all modules are processed @@ -129,6 +129,21 @@ Or to restart the `prepare` from the beginning: See http://maven.apache.org/maven-release/maven-release-plugin/examples/prepare-release.html +=== Pre-check created Jars + +It's best to run check_jars.sh prior to creating (and staging) the +Release Candidate. + + buildTools/check_jars.sh --findmode build-release 1.2.0 . + +If there are any problems raise the issues on the "[DISCUSS]" thread. If the decision is to make changes now, address them, remove the release tag and redo the Prepare. + + Remove the release tag: + + git push --delete origin <tag> # delete the remote tag + git tag --delete <tag> # delete the local tag + + == Create and Stage the Release Candidate In this phase on the previously prepared release branch, the release candidate is built, tested and staged to the remote Maven (Nexus) repository configured in the pom. @@ -201,16 +216,11 @@ If another artifact is subsequently uploaded for an Edgent groupId, Nexus will c == Stage the Source Release Artifacts -See the Release Manager's Guide for staging the release candidate's source release -artifacts to the ASF release staging repository https://dist.apache.org/repos/dist/dev/incubator/edgent. - -== Do the Release Candidate Voting - -See the Release Manager's Guide for the vote process and info. Once the vote is complete the Guide will direct you back here to continue. +See the Release Manager's Guide to continue the workflow at "Staging the Source Release Candidate". You will be redirected back here after the RC vote is complete. -== Actions if the vote passed +== Actions if the RC vote passed -If the vote passed and the staged release candidate should be officially released. +If the RC vote passed the staged release candidate should be officially released. Officially release the Nexus staging repository: @@ -222,7 +232,7 @@ After this Nexus takes care of all further steps of copying the artifacts to the See the Release Manager's Guide for information on publishing the staged source release bundles and merging an approved release to the `master`, and possibly `develop`, branches. -== Actions if the vote failed +== Actions if the RC vote failed If something popped up during the vote on the release and the release candidate has to be dropped, two things have to be done: @@ -246,7 +256,7 @@ Issues can now be addressed, typically on the release branch, and as soon all is == Cleanup Hints -If you wish to completely reset your repository back to the way it was before doing any of these release process steps it can be done with a little work. +If you wish to completely reset the source repository back to the way it was before doing any of these release process steps it can be done with a little work. Due to the way that the plugin works, even creating the release branch results in changes committed and (auto) pushed to the `develop` branch (advancing the poms Edgent versions to the next development version). Sigh. @@ -258,6 +268,7 @@ Here's what you'll need to delete/undo: Remove the release branch locally and remotely (be sure :-) + # CAUTION: make sure you're deleting an unwanted release branch! git checkout develop git push --delete origin <branch-name> # remote git branch -D <branch-name> # local
