1
0
mirror of https://github.com/thooge/esp32-nmea2000-obp60.git synced 2026-02-11 07:03:07 +01:00

add buildname to ci output file names, correctly set initial build name

This commit is contained in:
wellenvogel
2025-09-30 20:03:45 +02:00
parent 5493c9695c
commit 6da87e4455

View File

@@ -167,9 +167,18 @@ class PipelineInfo{
updateStatus(); updateStatus();
if (gitSha !== undefined) param.tag=gitSha; if (gitSha !== undefined) param.tag=gitSha;
param.config=JSON.stringify(config); param.config=JSON.stringify(config);
let buildname=config['root:buildname']
if (buildname){
param.suffix="-"+buildname
}
if (buildVersion !== undefined){ if (buildVersion !== undefined){
if (param.suffix){
param.suffix+="-"+buildVersion;
}
else{
param.suffix="-"+buildVersion; param.suffix="-"+buildVersion;
} }
}
fetchJson(API,Object.assign({ fetchJson(API,Object.assign({
api:'start'},param)) api:'start'},param))
.then((json)=>{ .then((json)=>{
@@ -528,28 +537,32 @@ class PipelineInfo{
if (config.type === 'string'){ if (config.type === 'string'){
let ip=addEl('input','t'+config.type,inputFrame); let ip=addEl('input','t'+config.type,inputFrame);
addDescription(config,inputFrame); addDescription(config,inputFrame);
ip.value=current?current:""; const buildChild=(value)=>{
if (value) {
if (config.max) {
if (value && value.length > config.max) {
value = value.substring(0, config.max);
}
}
if (config.allowed) {
let check = new RegExp("[^" + config.allowed + "]", "g");
let nv = value.replace(check, "");
if (nv != value) {
value = nv;
}
}
}
return Object.assign({},config,{key: value,value:value});
}
initialConfig=buildChild(current);
ip.value=initialConfig.value||"";
ip.addEventListener('change',(ev)=>{ ip.addEventListener('change',(ev)=>{
let value=ev.target.value; let value=ev.target.value;
let modified=false; let cbv=buildChild(value);
if (config.max){ if (cbv.value != value){
if (value && value.length > config.max){ ev.target.value=cbv.value;
modified=true;
value=value.substring(0,config.max);
} }
} callback(cbv,false);
if (config.allowed){
let check=new RegExp("[^"+config.allowed+"]","g");
let nv=value.replace(check,"");
if (nv != value){
modified=true;
value=nv;
}
}
if (modified){
ev.target.value=value;
}
callback(Object.assign({},config,{key: value,value:value}),false);
}); });
} }