You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2016/05/20 09:25:01 UTC
[1/2] cordova-coho git commit: CB-11280 Pin nightly platforms versions
Repository: cordova-coho
Updated Branches:
refs/heads/master 9e98cda18 -> 7c0e36284
CB-11280 Pin nightly platforms versions
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/6b5209d8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/6b5209d8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/6b5209d8
Branch: refs/heads/master
Commit: 6b5209d8c9bdaedb107bdd35474d6cf45ac2ba00
Parents: 9e98cda
Author: Vladimir Kotikov <ko...@gmail.com>
Authored: Wed May 18 17:07:20 2016 +0300
Committer: Vladimir Kotikov <ko...@gmail.com>
Committed: Thu May 19 12:07:08 2016 +0300
----------------------------------------------------------------------
src/nightly.js | 6 ++++++
src/versionutil.js | 24 ++++++++----------------
2 files changed, 14 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6b5209d8/src/nightly.js
----------------------------------------------------------------------
diff --git a/src/nightly.js b/src/nightly.js
index 188e424..11a2e98 100644
--- a/src/nightly.js
+++ b/src/nightly.js
@@ -86,6 +86,12 @@ module.exports = function*(argv) {
});
});
+ // Pin nightly versions of platforms
+ if (reposToBuild.some(function (repo) { return repo.id === 'lib'; })) {
+ apputil.print('Updating platforms pinned versions...');
+ versionutil.updatePlatformsConfig(VERSIONS);
+ }
+
//npm link repos that should be linked
yield npmlink();
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/6b5209d8/src/versionutil.js
----------------------------------------------------------------------
diff --git a/src/versionutil.js b/src/versionutil.js
index 2458b13..0d42bf1 100644
--- a/src/versionutil.js
+++ b/src/versionutil.js
@@ -36,23 +36,16 @@ exports.removeDev = removeDev;
//Needs to be passed a object which includes repo.id as key
//and the new version as value
//ex {android:4.0.0}
-function *updatePlatformsConfig(newValues) {
-
- var platformsConfig = path.join(repoutil.getRepoDir('cordova-lib'),
- 'src/cordova/platformsConfig.json');
- console.log(platformsConfig);
+function updatePlatformsConfig(newValues) {
+ var platformsConfig = path.join(repoutil.getRepoDir(repoutil.getRepoById('lib')), 'src/platforms/platformsConfig.json');
var platformsJS = require(platformsConfig);
- var repos = flagutil.computeReposFromFlag('active-platform');
-
- yield repoutil.forEachRepo(repos, function*(repo) {
- if(repo.id === 'windows') {
- platformsJS[repo.id].version = newValues[repo.id];
- platformsJS['windows8'].version = newValues[repo.id];
- } else if(repo.id === 'blackberry') {
- platformsJS['blackberry10'].version = newValues[repo.id];
- } else {
- platformsJS[repo.id].version = newValues[repo.id];
+ flagutil.computeReposFromFlag('active-platform')
+ .forEach(function(repo) {
+ if (newValues[repo.id]) {
+ // For blackberry platformsConfig.json uses 'blackberry10' key
+ var correctRepoId = (repo.id === 'blackberry') ? "blackberry10" : repo.id;
+ platformsJS[correctRepoId].version = newValues[repo.id];
}
});
@@ -92,7 +85,6 @@ exports.updateRepoVersion = function *updateRepoVersion(repo, version, opts) {
shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('bin', 'templates', 'project','cordova', 'version'));
} else if (repo.id == 'windows') {
if(fs.existsSync(path.join('template', 'cordova', 'version'))) {
- console.log('version exists');
shelljs.sed('-i', /VERSION.*=.*;/, 'VERSION = "' + version + '";', path.join('template', 'cordova', 'version'));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/2] cordova-coho git commit: CB-11280 Update bundled dependencies
for platforms
Posted by an...@apache.org.
CB-11280 Update bundled dependencies for platforms
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/7c0e3628
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/7c0e3628
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/7c0e3628
Branch: refs/heads/master
Commit: 7c0e36284e569f8d9c6972d04f36677c3c768757
Parents: 6b5209d
Author: Vladimir Kotikov <ko...@gmail.com>
Authored: Wed May 18 18:48:48 2016 +0300
Committer: Vladimir Kotikov <ko...@gmail.com>
Committed: Fri May 20 12:13:51 2016 +0300
----------------------------------------------------------------------
src/nightly.js | 55 +++++++++++++++++++++++++------------------------
src/versionutil.js | 4 +++-
2 files changed, 31 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7c0e3628/src/nightly.js
----------------------------------------------------------------------
diff --git a/src/nightly.js b/src/nightly.js
index 11a2e98..33cf3ca 100644
--- a/src/nightly.js
+++ b/src/nightly.js
@@ -74,16 +74,7 @@ module.exports = function*(argv) {
yield repoutil.forEachRepo(reposToBuild, function*(repo) {
apputil.print('Updating ' + repo.id + ' version to ' + VERSIONS[repo.id]);
yield versionutil.updateRepoVersion(repo, VERSIONS[repo.id], { commitChanges: false });
-
- var packageJSONPath = path.join(process.cwd(), 'package.json');
- var packageJSON = JSON.parse(fs.readFileSync(packageJSONPath));
-
- // If there is a dependencies listed, iterate through and update cordova-* dependencies
- packageJSON.dependencies = mapDependenciesVersions(packageJSON.dependencies, VERSIONS);
-
- fs.writeFileSync(packageJSONPath, JSON.stringify(packageJSON, null, 2) + '\n', 'utf8', function(err) {
- if (err) return console.log (err);
- });
+ updateRepoDependencies(repo, VERSIONS);
});
// Pin nightly versions of platforms
@@ -101,8 +92,14 @@ module.exports = function*(argv) {
yield executil.execHelper(executil.ARGS('npm install'), /*silent=*/true, false);
});
- //run CLI + cordova-lib tests
- yield runTests(reposToBuild, argv.ignoreTestFailures);
+ // Tests for platforms have some environment requirements (presence of build systems,
+ // SDKs, etc.) which are impossible to satisfy in Jenkins environment, so we're
+ // excluding platforms repos from testing
+ var reposToTest = reposToBuild.filter(function (repo) {
+ return !repoutil.isInRepoGroup(repo, 'platform');
+ });
+ // Run CLI + cordova-lib tests
+ yield runTests(reposToTest, argv.ignoreTestFailures);
var options = {};
options.tag = 'nightly';
@@ -132,24 +129,28 @@ function* prepareRepos(repoNames) {
}
/**
- * Updates provided dependencies object with versions, supplied in packageVersions object
- * @param {Object<String, String>} packageDependencies A map of current package's dependencies to versions
- * @param {Object<String, String>} packageVersions Map of package's id's to nightly versions
- * @returns {Object<String, String>} A mapped object
+ * Updates current repo dependencies with versions, supplied in dependencies object
+ * @param {Object} repo Current repo which dependencies need to be updated
+ * @param {Object<String, String>} dependencies Map of package's id's and nightly versions
*/
-function mapDependenciesVersions(packageDependencies, packageVersions) {
- return Object.keys(packageDependencies)
- .reduce(function (result, dependency) {
- var dep = repoutil.getRepoById(dependency);
- // If this is a cordova-* dependency, and we're going to build nightly for it
- if (dependency.match(/cordova\-.*/) && dep && packageVersions[dep.id]) {
- // Update its version in package's dependencies to nightly version
- apputil.print('Updating ' + dependency + ' dependency version to ' + packageVersions[dep.id]);
- result[dependency] = packageVersions[dep.id];
+function updateRepoDependencies(repo, dependencies) {
+ var packageJSONPath = path.join(process.cwd(), 'package.json');
+ var packageJSON = JSON.parse(fs.readFileSync(packageJSONPath));
+
+ // Let's iterate through repos we're going to release
+ Object.keys(dependencies).map(function (dependencyId) {
+ var repo = repoutil.getRepoById(dependencyId);
+ var packageId = repo.packageName || repo.repoName;
+
+ if (packageJSON.dependencies[packageId]) {
+ // If current repo has dependency that points to one of packages, we're going
+ // to release, update that dependency's version to nightly
+ apputil.print('Updating ' + packageId + ' dependency version to ' + dependencies[dependencyId]);
+ packageJSON.dependencies[packageId] = dependencies[dependencyId];
}
+ });
- return result;
- }, packageDependencies);
+ fs.writeFileSync(packageJSONPath, JSON.stringify(packageJSON, null, 2) + '\n', 'utf8');
}
function *runTests(repos, ignoreTestFailures) {
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/7c0e3628/src/versionutil.js
----------------------------------------------------------------------
diff --git a/src/versionutil.js b/src/versionutil.js
index 0d42bf1..a4b895c 100644
--- a/src/versionutil.js
+++ b/src/versionutil.js
@@ -37,7 +37,9 @@ exports.removeDev = removeDev;
//and the new version as value
//ex {android:4.0.0}
function updatePlatformsConfig(newValues) {
- var platformsConfig = path.join(repoutil.getRepoDir(repoutil.getRepoById('lib')), 'src/platforms/platformsConfig.json');
+
+ var platformsConfig = path.join(repoutil.getRepoDir(repoutil.getRepoById('lib')),
+ 'src/platforms/platformsConfig.json');
var platformsJS = require(platformsConfig);
flagutil.computeReposFromFlag('active-platform')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org