update trigger regex
This commit is contained in:
@ -34,9 +34,6 @@ switch (command){
|
||||
case "install":
|
||||
install(commandOption);
|
||||
break;
|
||||
case "test":
|
||||
test(commandOption);
|
||||
break;
|
||||
case "prepare":
|
||||
prepare(commandOption);
|
||||
break;
|
||||
@ -44,6 +41,12 @@ switch (command){
|
||||
publish(commandOption)
|
||||
.then(trigger);
|
||||
break;
|
||||
case "test":
|
||||
test(commandOption);
|
||||
break;
|
||||
case "trigger":
|
||||
trigger();
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -9,7 +9,7 @@ let triggerEnvPrefix = "NPMCI_TRIGGER_";
|
||||
export let trigger = function(){
|
||||
let done = plugins.q.defer();
|
||||
plugins.beautylog.info("now running triggers");
|
||||
let triggerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)/;
|
||||
let triggerRegex = /^([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|([a-zA-Z0-9\.]*)\|?([a-zA-Z0-9\.]*)/;
|
||||
for(let i = 0; i < 100; i++){
|
||||
let iteratorString = i.toString();
|
||||
let triggerName = triggerEnvPrefix + iteratorString
|
||||
@ -19,8 +19,14 @@ export let trigger = function(){
|
||||
let regexProjectId = triggerRegexResultArray[2];
|
||||
let regexProjectTriggerToken = triggerRegexResultArray[3];
|
||||
let regexRefName = triggerRegexResultArray[4];
|
||||
plugins.beautylog.log("triggering build for ref " + regexRefName);
|
||||
plugins.beautylog.log("Found TRIGGER" + iteratorString);
|
||||
let regexTriggerName;
|
||||
if(triggerRegexResultArray.length = 5){
|
||||
regexTriggerName = triggerRegexResultArray[5];
|
||||
} else {
|
||||
regexTriggerName = "Unnamed Trigger";
|
||||
}
|
||||
plugins.beautylog.log("Found" + triggerName);
|
||||
plugins.beautylog.log("triggering build for ref " + regexRefName + " of " + regexTriggerName);
|
||||
plugins.request.post("https://gitlab.com/api/v3/projects/" + regexProjectId + "/trigger/builds", {form:{token:regexProjectTriggerToken,ref:regexRefName}});
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user