These are all merged in, on the master branch. GitHub claimed that #96 was failing on the Travis server, but I tested it, and didn't see any test failures here.
I didn't cherry-pick them onto 3.7.x; I don't know if the 3.7.x branch is considered a "release branch" right now. All of the commits since 3.7.0 was tagged seem like they should probably go into the next release anyway, so I'd probably just want to re-branch from master for 4.0.0, or 10.0.0, or whatever the next version turns out to be. Ian On Tue, Oct 7, 2014 at 7:16 AM, Ian Clelland <iclell...@chromium.org> wrote: > That's awesome, Sergey: Thanks! > > I didn't expect the patch to be so small :) > > I'll take a look at the others this morning and merge them in as well. > > Ian > > On Tue, Oct 7, 2014 at 4:26 AM, Sergey Grebnov (Akvelon) < > v-seg...@microsoft.com> wrote: > >> I've investigated both blocking issues (CB-7718, CB-6777), here is the >> fix (root cause is the same): >> https://github.com/apache/cordova-lib/pull/102 >> >> Please also review and include to release branch the following PRs since >> we have real cases when build fails w/o those fixes. >> >> CB-7670 Fixes failure when trying to fetch dependent plugin while adding >> platform >> https://github.com/apache/cordova-lib/pull/96 >> >> CB-7715 Fix windows build if folder has '.(js|htm|etc)' in name >> https://github.com/apache/cordova-lib/pull/99 >> >> Thx! >> Sergey >> -----Original Message----- >> From: iclell...@google.com [mailto:iclell...@google.com] On Behalf Of >> Ian Clelland >> Sent: Monday, October 6, 2014 7:31 PM >> To: dev@cordova.apache.org >> Cc: Steven Gill; Parashuram Narasimhan (MS OPEN TECH); Shazron >> Subject: Re: [VOTE] Tools Release >> >> We can look at doing that; CB-6481 is a series of 12 commits, though, so >> it may be more difficult than just removing a single commit. >> >> (Also, Marcel pointed me to CB-7677, which is the same issue -- I've >> upgraded it to blocker as well) >> >> On Mon, Oct 6, 2014 at 11:26 AM, Parashuram Narasimhan (MS OPEN TECH) < >> panar...@microsoft.com> wrote: >> >> > Should we simply cherry pick that comment out and go ahead with the >> > release? The existing latest release (3.6.4) has a bunch of bugs in >> > the Windows platform that need to be fixed. >> > >> > -----Original Message----- >> > From: iclell...@google.com [mailto:iclell...@google.com] On Behalf Of >> > Ian Clelland >> > Sent: Monday, October 6, 2014 7:57 AM >> > To: Steven Gill >> > Cc: Shazron; dev@cordova.apache.org >> > Subject: Re: [VOTE] Tools Release >> > >> > FYI, I just opened CB-7718 as a blocking issue against CordovaLib. I >> > haven't tracked down the cause (except that it's somewhere in the >> > CB-6481 >> > code) but if we were to re-open the vote, I'd have to -1 it. >> > >> > On Fri, Oct 3, 2014 at 7:39 PM, Steven Gill <stevengil...@gmail.com> >> > wrote: >> > >> > > Okay, taking this discussion back into "independent platform release >> > > summary" thread >> > > >> > > On Fri, Oct 3, 2014 at 4:21 PM, Shazron <shaz...@gmail.com> wrote: >> > > >> > > > Did we have consensus on 4.0 though? I would think a bigger >> > > > version would increase separation - and that's what I sensed >> consensus on. >> > > > After a few releases, the cordova platforms will already be at >> > > > 4.0, and we're at >> > > square >> > > > one. >> > > > >> > > > On Fri, Oct 3, 2014 at 2:38 PM, Steven Gill >> > > > <stevengil...@gmail.com> >> > > > wrote: >> > > > >> > > >> I am going to close this vote and redo it with CLI + Lib >> > > >> versioning set >> > > to >> > > >> 4.0.0 >> > > >> >> > > >> On Thu, Oct 2, 2014 at 7:37 AM, Steven Gill >> > > >> <stevengil...@gmail.com> >> > > >> wrote: >> > > >> >> > > >> > I must have forgot to run svn up. I'll do it soon when I get to >> > > >> > my computer. >> > > >> > >> > > >> > >> > > >> > On Thursday, October 2, 2014, Sergey Grebnov (Akvelon) < >> > > >> > v-seg...@microsoft.com> wrote: >> > > >> > >> > > >> >> I don't see Tools packages on >> > > >> >> https://dist.apache.org/repos/dist/dev/cordova/CB-7661/ >> > > >> >> Am I looking to wrong location? >> > > >> >> >> > > >> >> Thx! >> > > >> >> Sergey >> > > >> >> -----Original Message----- >> > > >> >> From: Steven Gill [mailto:stevengil...@gmail.com] >> > > >> >> Sent: Thursday, October 2, 2014 3:14 AM >> > > >> >> To: dev@cordova.apache.org >> > > >> >> Subject: [VOTE] Tools Release >> > > >> >> >> > > >> >> Please review and vote on this Tools Release. >> > > >> >> >> > > >> >> Release issue: https://issues.apache.org/jira/browse/CB-7661 >> > > >> >> >> > > >> >> Both tools have been published to >> > > >> >> dist/dev:https://dist.apache.org/repos/dist/dev/cordova/CB-766 >> > > >> >> 1/ >> > > >> >> >> > > >> >> The packages were published from their corresponding git tags: >> > > >> >> >> > > >> >> cordova-js: 3.7.0 (d84626637e) >> > > >> >> cordova-lib: 3.7.0 (329275484b) >> > > >> >> cordova-plugman: 0.22.11 (6ac534395a) >> > > >> >> cordova-cli: 3.7.0 (88e0c3ac00) >> > > >> >> >> > > >> >> You can test the cli by running npm install -g cordova@rc >> > > >> >> >> > > >> >> To test Android, Browser, Windows, WP, use --usegit flag when >> > > >> >> adding >> > > >> them >> > > >> >> to your project. >> > > >> >> ex. cordova platform add android --usegit >> > > >> >> >> > > >> >> >> > > >> >> As you can see, in this release I have made the cli semver >> > compliant. >> > > >> >> The version is now 3.7.0. >> > > >> >> I have also made cordova-lib's version 3.7.0 to sync up the two. >> > > >> >> If >> > > you >> > > >> >> have any issues with this, lets discuss. >> > > >> >> >> > > >> >> >> > > >> >> Upon a successful vote I will upload the archives to dist/, >> > > >> >> publish >> > > >> them >> > > >> >> to NPM, and post the corresponding blog post. >> > > >> >> >> > > >> >> Voting guidelines: >> > > >> >> >> > > >> >> > > https://github.com/apache/cordova-coho/blob/master/docs/release-voti >> > > ng >> > > .md >> > > >> >> >> > > >> >> Voting will go on for a minimum of 48 hours. >> > > >> >> >> > > >> >> I vote +1: >> > > >> >> * Ran coho audit-license-headers over the relevant repos >> > > >> >> * Used `license-checker` to ensure all dependencies have >> > > >> >> Apache-compatible licenses >> > > >> >> >> > > >> > >> > > >> >> > > > >> > > > >> > > >> > >> > >
