Updated Branches: refs/heads/master fa67a24cd -> 1b9afc41e
Fix create-release-branch not updating JS first. Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/025357a2 Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/025357a2 Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/025357a2 Branch: refs/heads/master Commit: 025357a22b82e31d81778982cefb55d92767de85 Parents: fa67a24 Author: Andrew Grieve <[email protected]> Authored: Tue Jun 18 13:51:42 2013 -0400 Committer: Andrew Grieve <[email protected]> Committed: Tue Jun 18 13:51:42 2013 -0400 ---------------------------------------------------------------------- coho | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/025357a2/coho ---------------------------------------------------------------------- diff --git a/coho b/coho index 181b908..0a9c02d 100755 --- a/coho +++ b/coho @@ -651,9 +651,9 @@ function createReleaseBranchCommand() { updateRepos(repos, [], true); var hasRunJake = false; + var cordovaJsRepo = getRepoById('js'); function ensureJsIsBuilt() { - var cordovaJs = getRepoById('js'); - forEachRepo([cordovaJs], function() { + forEachRepo([cordovaJsRepo], function() { var actualCurTag = retrieveCurrentTagName(); if (actualCurTag != version) { fatal('Not preparing branches since cordova-js is not at the version tag. (it\'s at ' + actualCurTag + ')'); @@ -665,6 +665,13 @@ function createReleaseBranchCommand() { }); } + // Ensure cordova-js comes first. + var repoIndex = repos.indexOf(cordovaJsRepo); + if (repoIndex != -1) { + repos.splice(repoIndex, 1); + repos.unshift(cordovaJsRepo); + } + forEachRepo(repos, function(repo) { stashAndPop(repo, function() { // git fetch + update master
