Github user nikhilkh commented on a diff in the pull request:
https://github.com/apache/cordova-coho/pull/122#discussion_r63557500
--- Diff: src/nightly.js ---
@@ -60,36 +62,26 @@ module.exports = function*(argv) {
}
// Clone and update Repos
- yield repoclone.cloneRepos(repos, /*silent=*/true);
- yield repoupdate.updateRepos(repos);
-
- //remove local changes and sync up with remote master
- yield repoutil.forEachRepo(repos, function*() {
- yield gitutil.gitClean();
- yield gitutil.resetFromOrigin();
- });
+ yield prepareRepos(argv.r);
- // Get SHAS from repos
- var SHAJSON = yield retrieveSha(repos);
+ var reposToBuild = flagutil.computeReposFromFlag(argv.r, {
includeModules: true });
+ // Get updated nightly versions for all repos
+ /** @type {Object} A map of repo.id and a short SHA for every repo to
build */
+ var VERSIONS = yield retrieveVersions(reposToBuild);
- var currentDate = new Date();
- var nightlyVersion = '-nightly.' + currentDate.getFullYear() + '.' +
- (currentDate.getMonth() + 1) + '.' + currentDate.getDate();
- var cordovaLibVersion;
//update package.json version for cli + lib, update lib reference for
cli
- yield repoutil.forEachRepo([cordovaLib, cli], function*(repo) {
- var dir = process.cwd();
- var packageJSON = require(dir+'/package.json');
- packageJSON.version = versionutil.removeDev(packageJSON.version) +
nightlyVersion +
- '+' + SHAJSON[repo.id];
-
- if(repo.id === 'lib'){
- cordovaLibVersion = packageJSON.version;
- } else {
- packageJSON.dependencies['cordova-lib'] = cordovaLibVersion;
- }
+ yield repoutil.forEachRepo(reposToBuild, function*(repo) {
+ var packageJSONPath = path.join(process.cwd(), 'package.json');
+ var packageJSON = require(packageJSONPath);
--- End diff --
Also, there is the version script too - I believe coho has methods to
update the version. For now we might have to just use them. But we should file
a JIRA to clean that up to reduce to one source of version from package.json
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]