diff --git a/BuildServer/lib/builder.js b/BuildServer/lib/builder.js index 1d7ec2d..e255c51 100644 --- a/BuildServer/lib/builder.js +++ b/BuildServer/lib/builder.js @@ -40,7 +40,7 @@ var build = function (options, callback) { }, function(err) { if (err) { console.log(err); - return done(err); + return done("Git fetch error: " + err); } console.log("Done loading from git"); fs.exists(exported + "/mbs.json", function (exists) { @@ -61,6 +61,10 @@ var build = function (options, callback) { } processor.processTask(task, { + owner: owner, + reponame: reponame, + branch: branch, + rev: rev, tmp: tmp, exported: exported, release: release diff --git a/BuildServer/lib/tasks/conditional.js b/BuildServer/lib/tasks/conditional.js new file mode 100644 index 0000000..9852c24 --- /dev/null +++ b/BuildServer/lib/tasks/conditional.js @@ -0,0 +1,19 @@ +"use strict"; + +module.exports = function (params, processor) { + return { + process: function () { + if (params.owner && params.owner != processor.context.owner) { + return processor.done(); + } + + if (params.branch && params.branch != processor.context.branch) { + return processor.done(); + } + + processor.processTask(params.task, function () { + processor.done(); + }); + } + }; +};