Merge branch 'develop' into stable

This commit is contained in:
Samuele E. Locatelli
2020-01-14 10:26:27 +01:00
Vendored
+2 -2
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=177']) {
withEnv(['NEXT_BUILD_NUMBER=178']) {
// env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '0.7.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
@@ -160,7 +160,7 @@ pipeline {
[
artifactId: 'NKC',
classifier: "${env.classifier}",
file: "NKC\\Releases\\${env.BRANCH_NAME}\\NKC.zip",
file: "NKC_WF\\Releases\\${env.BRANCH_NAME}\\NKC.zip",
type: 'zip'
]
],