From 8b53913c8c055b00e591e2eac70d737bf1ff5f00 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 22 Oct 2020 17:12:40 +0200 Subject: [PATCH 1/2] new graph test fix --- Jenkinsfile | 2 +- NKC_WF/WebUserControls/cmp_kittingBin.ascx | 2 +- NKC_WF/WebUserControls/cmp_kittingCart.ascx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0e2c07..c3c86d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=378']) { + withEnv(['NEXT_BUILD_NUMBER=379']) { // env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.versionNumberBeta = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx b/NKC_WF/WebUserControls/cmp_kittingBin.ascx index 2d71b2c..cb45c4e 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx @@ -4,7 +4,7 @@
-