royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [royale-asjs.wiki] branch master updated: Updated Release Manager Notes (markdown)
Date Wed, 10 Jan 2018 19:23:28 GMT
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/royale-asjs.wiki.git


The following commit(s) were added to refs/heads/master by this push:
     new 19481e2  Updated Release Manager Notes (markdown)
19481e2 is described below

commit 19481e2a7e52d45bb7411ed4edb914967c54e280
Author: aharui <aharui@apache.org>
AuthorDate: Wed Jan 10 11:23:27 2018 -0800

    Updated Release Manager Notes (markdown)
---
 Release-Manager-Notes.md | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/Release-Manager-Notes.md b/Release-Manager-Notes.md
index 78d3253..955444e 100644
--- a/Release-Manager-Notes.md
+++ b/Release-Manager-Notes.md
@@ -11,4 +11,24 @@ Maven release steps use the Maven release plugin which uses SSH instead
of HTTPS
 * [Windows](http://help.github.com/msysgit-key-setup/)
 * [Mac OSX](http://help.github.com/mac-git-installation/)
 
-It appears that Maven will do its work without updating the local working copy.  So doing
a "git pull" after the Maven steps is advised.  For example, Maven pushed changes and a new
branch to the remote, but my local working copy still said I had changes to commit.
\ No newline at end of file
+It appears that Maven will do its work without updating the local working copy.  So doing
a "git pull" after the Maven steps is advised.  For example, Maven pushed changes and a new
branch to the remote, but my local working copy still said I had changes to commit.
+
+## Canceling an RC
+
+To cancel an RC and generate a new RC, you have to revert certain changes that Maven made
to the release branch.  I have not tried the Maven Release Plugin's rollback capability because
the documentation implies it would only work before you use the "perform" step.
+
+If the plan is to accept some changes to the release branch and create a new RC, run "git
checkout <release-branch>" to switch to the release branch and do a "git pull --rebase"
to sync it up.  Then look at the log via "git log".  You should see some log entries.  One
should say:
+
+`[maven-release-plugin] prepare for next development iteration`
+
+Another should be:
+
+`[maven-release-plugin] prepare release org.apache.royale.<repo>-<release version>-rc<RC#>`
+
+In the royale-asjs and royale-typedefs branches there may be a third:
+
+`remove SNAPSHOT from compiler-build-tools versions`
+
+Revert these entries via "git revert <hash of commit>"
+
+Do the above for all 3 repos.  Then you can accept the changes to the release branch and
run the "maven" step again.  Note that you should not merge the develop branch into the release
branch because Maven has already updated the develop branch to the next release version.
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <commits@royale.apache.org>'].

Mime
View raw message