Authored by 沈志敏

检查分支 支持可配置

... ... @@ -90,16 +90,16 @@ module.exports = {
router,
async check() {
let rule = new schedule.RecurrenceRule();
let projects = await Project.findAll();
if (!projects || !projects.length) {
return;
}
rule.dayOfWeek = [0, new schedule.Range(1, 6)];  
rule.hour = 23;
rule.minute = 59;  
schedule.scheduleJob(rule, function() {
schedule.scheduleJob(rule, async() => {
let running = {};
let projects = await Project.findAll();
if (!projects || !projects.length) {
return;
}
projects.forEach(async(p) => {
if (p.name !== 'yohobuywap-node') { // todo 暂时只检查wap站
... ... @@ -107,7 +107,7 @@ module.exports = {
}
if (!running[p.name]) {
running[p.name] = true;
new Check(p.name, p.gitlab, 'release/5.6').check();
new Check(p.name, p.gitlab, p.checkbranch || 'master').check();
}
});
});
... ...
... ... @@ -81,6 +81,22 @@
<!-- row -->
<div class="row">
<div class="col-sm-12">
<h5 class="lg-title mb10">检查分支配置</h5>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<div class="form-group">
<label class="col-lg-2 control-label" style="text-align: right;padding-top: 7px;">Git分支:</label>
<div class="col-lg-10">
<input type="text" name="checkbranch" value="{{project.checkbranch}}"
class="form-control" placeholder="默认:master">
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<h5 class="lg-title mb10">脚本配置</h5>
</div>
</div>
... ...