update jenkinsfile x riallineare...

This commit is contained in:
Samuele E. Locatelli
2017-10-25 18:51:11 +02:00
parent 837c622785
commit 76c46cc7d3
2 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -1134,7 +1134,7 @@ namespace IOB_WIN
// salvo!
lastPrgName = currPrgName;
displayOtherData(currPrgName);
lg.Info(string.Format("PrgName: {0}", currPrgName));
lg.Info(string.Format("{0}", currPrgName));
// !!!FARE!!! deve inviare!!!
}
}
@@ -1158,7 +1158,7 @@ namespace IOB_WIN
// salvo!
lastSysInfo = currSysInfo;
displayOtherData(currSysInfo);
lg.Info(string.Format("SysInfo: {0}", currSysInfo));
lg.Info(string.Format("{0}", currSysInfo));
// !!!FARE!!! deve inviare!!!
}
}
Vendored
+3 -3
View File
@@ -11,9 +11,9 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=67']) {
env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
// env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=83']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO-IOB-WIN'
}
}