Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7166F200BE2 for ; Thu, 1 Dec 2016 02:59:49 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 6C9EB160B19; Thu, 1 Dec 2016 01:59:49 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B6BEA160B13 for ; Thu, 1 Dec 2016 02:59:48 +0100 (CET) Received: (qmail 32771 invoked by uid 500); 1 Dec 2016 01:59:47 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 32762 invoked by uid 99); 1 Dec 2016 01:59:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Dec 2016 01:59:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3B72DFCF9; Thu, 1 Dec 2016 01:59:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: shazron@apache.org To: commits@cordova.apache.org Message-Id: <05bd3f0aee3441a48b04fd91dc6407b4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cordova-coho git commit: Added patch release notes Date: Thu, 1 Dec 2016 01:59:47 +0000 (UTC) archived-at: Thu, 01 Dec 2016 01:59:49 -0000 Repository: cordova-coho Updated Branches: refs/heads/master 9108a8c0f -> 2c28fd092 Added patch release notes Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/2c28fd09 Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/2c28fd09 Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/2c28fd09 Branch: refs/heads/master Commit: 2c28fd092e9ef96dbbab5acbd115369ba37b9e91 Parents: 9108a8c Author: Shazron Abdullah Authored: Wed Nov 30 17:59:43 2016 -0800 Committer: Shazron Abdullah Committed: Wed Nov 30 17:59:43 2016 -0800 ---------------------------------------------------------------------- docs/platforms-release-process.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/2c28fd09/docs/platforms-release-process.md ---------------------------------------------------------------------- diff --git a/docs/platforms-release-process.md b/docs/platforms-release-process.md index 2a32b99..f640db6 100644 --- a/docs/platforms-release-process.md +++ b/docs/platforms-release-process.md @@ -101,8 +101,22 @@ Update the repos `RELEASENOTES.md` file with changes since the last release Commit these changes together into one commit (cd cordova-android && v="$(grep '"version"' package.json | cut -d'"' -f4)" && git commit -am "$JIRA Updated RELEASENOTES and Version for release $v") + +--- + +**PATCH RELEASE NOTES** + + +If you have prepared the release notes in your release branch for a patch release, you will have to cherry-pick the RELEASENOTES only into your master branch as well (stage only the appropriate hunk). + + git checkout master + git checkout -p RELEASENOTES_COMMIT_SHA_HASH -`coho prepare-release-branch` command handles the following steps: +For iOS, you may have to cherry-pick the commit for `Added X.Y.Z to CDVAvailability.h (via coho)` into the master branch as well. + +--- + +Prepare your release branch by using `coho prepare-release-branch` command, which handles the following steps: * Updating `cordova.js` snapshot * Creating a release branch (if it doesn't already exist) * Updating version numbers (`VERSION` file & package.json). On `master`, it gives version a minor bump and adds `-dev` --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org