From acc52ea92a5faae757c7f8b978ac948fbf58fef0 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 12 Apr 2017 15:42:01 +0200 Subject: [PATCH] fix main version --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5b3429..00e31d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,13 +15,13 @@ pipeline { script { withEnv(['NEXT_BUILD_NUMBER=4056']) { if (env.BRANCH_NAME == "master") { - env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '2.4.') + env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) } else { - env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMMdd"}.${BUILDS_TODAY, XX}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '2.4.') + env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMMdd"}.${BUILDS_TODAY, XX}', projectStartDate : '2006-01-01', skipFailedBuilds: true) } - /*env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, versionPrefix: '2.4.', overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')*/ + /*env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')*/ env.APP_NAME = 'GPW' } } @@ -36,7 +36,7 @@ pipeline { } /* CAMBIO numero versione in file sorgente!!! */ - bat "fart.exe VersGen\\GPW.cs 2.4.999.0 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe VersGen\\GPW.cs 999.0 ${env.versionNumber} || EXIT /B 0" } } stage('Build') {