In other news, I had to re-tag the JS because the build label was wrong.
You can actually see it in the previous email's output. It was
"3.1.0-rc1-0-g0d70465"
it should be "3.1.0-rc1". I've fixed it and re-tagged the JS.
On Tue, Sep 17, 2013 at 10:11 AM, Andrew Grieve <agri...@chromium.org>wrote:
> Jesse - The "-" in there is needed for the version to be
> semver-compatible. There was some work done to support the missing -, but I
> think it's still the case that without it plugins that have <engine> tags
> that require "cordova-win8 >= 3.1.0" might fail to parse your version
> without the -. Probably not something that needs to be fixed right away
> though since it'll still work fine for released versions.
>
> Joe - Yep, obviously I'd prefer you to try and fix coho, but certainly
> it's use isn't a requirement. Do be careful not to miss steps though.
> That's the goal of the tool.
>
> I ran it on cordova-android, and it did find that you missed a few things:
>
> ./cordova-coho/coho prepare-release-branch -r android --version 3.1.0-rc1
> ... SNIP ...
> ==== All work complete. 3 commits were made locally.
> ==== To review changes:
> ==== /Users/agrieve/git/cordova/cordova-coho/coho repo-status -r android
> -b master -b 3.1.x
> ==== To push changes:
> ==== /Users/agrieve/git/cordova/cordova-coho/coho repo-push -r android
> -b master -b 3.1.x
> ==== To revert all local commits:
> ==== /Users/agrieve/git/cordova/cordova-coho/coho repo-reset -r android
> -b master -b 3.1.x
>
>
> /Users/agrieve/git/cordova/cordova-coho/coho repo-status -r android -b
> master -b 3.1.x
>
> ====
> ====
> ====
> ==== cordova-android on branch master (vs origin/master): Commits exist.
> ==== a9423f3 Set VERSION to 3.2.0-dev (via coho)
> ==== c4bdd92 Update JS snapshot to version 3.1.0-rc1 (via coho)
> ==== cordova-android on branch 3.1.x (vs origin/3.1.x): Commits exist.
> ==== 47ac311 Set VERSION to 3.1.0-rc1 (via coho)
> ====
> ==== Diff (truncated) for cordova-android on branch master (vs
> origin/master):
> ==== diff --git a/VERSION b/VERSION
> ==== index 9001211..df4a767 100644
> ==== --- a/VERSION
> ==== +++ b/VERSION
> ==== @@ -1 +1 @@
> ==== -dev
> ==== \ No newline at end of file
> ==== +3.2.0-dev
> ==== diff --git a/bin/templates/cordova/version
> b/bin/templates/cordova/version
> ==== index 04e734c..36c3388 100755
> ==== --- a/bin/templates/cordova/version
> ==== +++ b/bin/templates/cordova/version
> ==== @@ -20,6 +20,6 @@
> ==== */
> ====
> ==== // Coho updates this line:
> ==== -var VERSION = '3.1.0-dev';
> ==== +var VERSION = "3.2.0-dev";
> ====
> ==== console.log(VERSION);
> ==== diff --git a/framework/assets/www/cordova.js
> b/framework/assets/www/cordova.js
> ==== index f798e7a..5f0ac0d 100644
> ==== --- a/framework/assets/www/cordova.js
> ==== +++ b/framework/assets/www/cordova.js
> ==== @@ -1,5 +1,5 @@
> ==== // Platform: android
> ==== -// 3.0.0rc1-1-g1965a39
> ==== +// 3.1.0-rc1-0-g0d70465
> ==== /*
> ==== Licensed to the Apache Software Foundation (ASF) under one
> ====
> ==== Diff (truncated) for cordova-android on branch 3.1.x (vs
> origin/3.1.x):
> ==== diff --git a/bin/templates/cordova/version
> b/bin/templates/cordova/version
> ==== index 04e734c..42bab55 100755
> ==== --- a/bin/templates/cordova/version
> ==== +++ b/bin/templates/cordova/version
> ==== @@ -20,6 +20,6 @@
> ==== */
> ====
> ==== // Coho updates this line:
> ==== -var VERSION = '3.1.0-dev';
> ==== +var VERSION = "3.1.0-rc1";
> ====
> ==== console.log(VERSION);
> ==== diff --git a/framework/src/org/apache/cordova/CordovaWebView.java
> b/framework/src/org/apache/cordova/CordovaWebView.java
> ==== index beb41ac..b1fc5e8 100755
> ==== --- a/framework/src/org/apache/cordova/CordovaWebView.java
> ==== +++ b/framework/src/org/apache/cordova/CordovaWebView.java
> ==== @@ -61,7 +61,7 @@ public class CordovaWebView extends WebView {
> ====
> ==== public static final String TAG = "CordovaWebView";
> ====
> ==== - public static final String CORDOVA_VERSION = "3.1.0-dev";
> ==== + public static final String CORDOVA_VERSION = "3.1.0-rc1";
> ====
> ==== private ArrayList<Integer> keyDownCodes = new
> ArrayList<Integer>();
> ==== private ArrayList<Integer> keyUpCodes = new ArrayList<Integer>();
> ====
> ====
>
>
>
> As for CHANGELOG.md, I was hoping we could start one (following suite from
> cordova-ios's RELEASENOTES.md). It makes writing "what's new" blog posts
> easier, and also helps to identify what needs extra testing. I actually
> didn't mean to change the name from RELEASENOTES, so I'll add the file
> update the instructions to use this name.
>
>
>
>
>
>
> On Mon, Sep 16, 2013 at 5:02 PM, Joe Bowser <bows...@gmail.com> wrote:
>
>> You set the version on the 3.1.x branch to 3.2.x-dev.
>>
>> I tried following the steps on the wiki, and coho still fails horribly
>> on this end. I'm going to keep tagging the old fashioned way with
>> git. We should try and keep use of coho only for what we have
>> problems with (managing multiple plugin repositories), and keep it out
>> of the parts that we don't (tagging releases, testing, etc).
>>
>>
>>
>> On Mon, Sep 16, 2013 at 1:09 PM, Andrew Grieve <agri...@chromium.org>
>> wrote:
>> > Also - FYI - I updated the coho command today to update the VERSION
>> file on
>> > repo master branches to be "3.2.0-dev".
>> >
>> >
>> > On Mon, Sep 16, 2013 at 4:08 PM, Andrew Grieve <agri...@chromium.org>
>> wrote:
>> >
>> >> Release Bug:
>> >> https://issues.apache.org/jira/browse/CB-4830
>> >>
>> >> I've done the first task (tagging JS).
>> >>
>> >> The release bug may not have all of the platforms that it should.
>> Wasn't
>> >> sure if win 8 or ffos should be in the list. If so, please add them :)
>> >>
>> >>
>> >> On Mon, Sep 16, 2013 at 3:26 PM, purplecabbage <
>> purplecabb...@gmail.com>wrote:
>> >>
>> >>> I'm still on a couple loose ends on windows8 and wp7/8. I'll tag
>> shortly.
>> >>>
>> >>> Sent from my iPhone
>> >>>
>> >>> > On Sep 16, 2013, at 12:06 PM, Andrew Grieve <agri...@chromium.org>
>> >>> wrote:
>> >>> >
>> >>> > Looks like no one volunteered for release master, so I'll do so for
>> this
>> >>> > one.
>> >>> >
>> >>> > First up is creating the release bug and branching JS / Spec. I'll
>> get
>> >>> on
>> >>> > it and report back! :)
>> >>> >
>> >>> >
>> >>> >> On Mon, Sep 16, 2013 at 2:57 PM, Joe Bowser <bows...@gmail.com>
>> wrote:
>> >>> >>
>> >>> >> So, what's happening with this release?
>> >>> >>
>> >>> >> On Tue, Sep 10, 2013 at 12:20 PM, Andrew Grieve <
>> agri...@chromium.org>
>> >>> >> wrote:
>> >>> >>> Sure! New plan:
>> >>> >>>
>> >>> >>> Monday 16th - Create release branches & tag RC of all repos
>> >>> >>> Tuesday 17th - Draft Release Blog Post (digest of changelogs)
>> >>> >>> Monday 20th - Tag 3.1.0 for all repos
>> >>> >>> Tuesday 21st - Push 3.1.0-1.0.0 of CLI to npm & Post blog post
>> >>> >>>
>> >>> >>> While we're at it, anyone want to volunteer to be Release Master?
>> (
>> >>> >>> https://wiki.apache.org/cordova/ReleaseMaster)
>> >>> >>>
>> >>> >>> Any of our Component Leads want to not be?
>> >>> >>> Android: Joe
>> >>> >>> BlackBerry: Lorin
>> >>> >>> CLI: Braden
>> >>> >>> JS: Andrew
>> >>> >>> Docs: Michael B
>> >>> >>> iOS: Shaz
>> >>> >>> Windows: Jesse
>> >>> >>> OSX: Shaz
>> >>> >>>
>> >>> >>>
>> >>> >>>
>> >>> >>>> On Tue, Sep 10, 2013 at 2:33 PM, Joe Bowser <bows...@gmail.com>
>> >>> wrote:
>> >>> >>>>
>> >>> >>>> Can we move this so it happens on Mondays instead of Fridays.
>> >>> >>>> Releasing on a Friday is never a good idea, especially since
>> we're
>> >>> >>>> going to be MIA for those two Fridays with internal stuff at the
>> >>> >>>> Vancouver Adobe office).
>> >>> >>>>
>> >>> >>>>
>> >>> >>>>
>> >>> >>>> On Mon, Sep 9, 2013 at 8:10 AM, James Jong <wjamesj...@gmail.com
>> >
>> >>> >> wrote:
>> >>> >>>>> Andrew, thanks for kicking it off. Also should note inclusion
>> of
>> >>> iOS
>> >>> >> 7
>> >>> >>>> support.
>> >>> >>>>> -James Jong
>> >>> >>>>>
>> >>> >>>>> On Sep 9, 2013, at 10:42 AM, Andrew Grieve <
>> agri...@chromium.org>
>> >>> >> wrote:
>> >>> >>>>>
>> >>> >>>>>> I think it's time to get the ball rolling on this. It'll be the
>> >>> first
>> >>> >>>>>> release post-3.0, so will likely have a few bumps to work
>> through.
>> >>> >>>>>>
>> >>> >>>>>> How about:
>> >>> >>>>>>
>> >>> >>>>>> Friday 13th - Create release branches & tag RC of all repos
>> >>> >>>>>> Monday 16th - Draft Release Blog Post (digest of changelogs)
>> >>> >>>>>> Thurs 19th - Tag 3.1.0 for all repos
>> >>> >>>>>> Fri 20th - Push 3.1.0-1.0.0 of CLI to npm & Post blog post
>> >>> >>>>>>
>> >>> >>>>>> The main feature of this release will be plugman-registry I
>> think.
>> >>> >> That
>> >>> >>>>>> said, since CLI / Plugman aren't tied to cadence releases, I
>> think
>> >>> >> it's
>> >>> >>>>>> just cordova-docs that is relevant.
>> >>> >>
>> >>>
>> >>
>> >>
>>
>
>
