From 4cb4cbdf37f9e90daa61bf99c6b45bd8ee442126 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 25 Oct 2017 10:51:24 +0200 Subject: [PATCH] faccio test SOLO su branch develop x deploy.. modifiche manifest anche x URL --- IOB-WIN/Resources/ChangeLog.html | 12 +++++++++--- IOB-WIN/Resources/manifest.xml | 2 +- Jenkinsfile | 25 ++++++++++++------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/IOB-WIN/Resources/ChangeLog.html b/IOB-WIN/Resources/ChangeLog.html index d7ce65a5..b5d933a3 100644 --- a/IOB-WIN/Resources/ChangeLog.html +++ b/IOB-WIN/Resources/ChangeLog.html @@ -2,19 +2,25 @@

TEST UPDATE

Note di rilascio:

- v.0.9.0.0 + v.0.10 +

+

+

+ v.0.9

- v.0.8.0.0 + v.0.8

- v.0.7.0.0 + v.0.7

diff --git a/IOB-WIN/Resources/manifest.xml b/IOB-WIN/Resources/manifest.xml index 0a51cc33..d743d59b 100644 --- a/IOB-WIN/Resources/manifest.xml +++ b/IOB-WIN/Resources/manifest.xml @@ -1,6 +1,6 @@ - 0.0.0.0 + 0.10.000.000 http://seriate.steamware.net:8083/SWS/MAPO-IOB-WIN/DEFAULT/MAPO-IOB-WIN.zip http://seriate.steamware.net:8083/SWS/MAPO-IOB-WIN/DEFAULT/ChangeLog.html false diff --git a/Jenkinsfile b/Jenkinsfile index d3fef5f6..ed99e938 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,9 +11,9 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=50']) { - env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) - // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') + withEnv(['NEXT_BUILD_NUMBER=62']) { + // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) + env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO-IOB-WIN' } } @@ -60,7 +60,7 @@ pipeline { steps { // in primis compilo a seconda del branch... TUTTO tranne develop... script { - if (env.BRANCH_NAME != "develop") { + if (env.BRANCH_NAME == "develop") { // CAMBIO numero versione in file sorgente!!! bat "fart.exe VersGen\\VersGen.cs 000.000 ${env.versionNumber} || EXIT /B 0" // restore nuget packages @@ -75,21 +75,20 @@ pipeline { // ora mi occupo delle operazioni di compressione e copia... script { /* DEPLOY condizionale: develop / master / demo_ovh */ - if (env.BRANCH_NAME != "develop") { + if (env.BRANCH_NAME == "develop") { // // elimino files di conf personalizzata per ogni install... // bat "RD /S /Q IOB-WIN\\bin\\Release\\DATA" // Compressione in .zip dell'installer... // powershell -ExecutionPolicy Unrestricted -File file.ps1 - - // COPIO in area IIS x autoupdate... sovrascrivendo zip - // manifest.xml: aggiorno versNumber - bat "fart.exe IOB-WIN\\Resources\\manifest.xml 0.0.0.0 ${env.versionNumber} || EXIT /B 0" - // manifest.xml: copio ed esporto in IIS02 - bat "xcopy /y IOB-WIN\\Resources\\manifest.xml c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\DEFAULT " - // ChangeLog.html: copio ed esporto in IIS02 - bat "xcopy /y IOB-WIN\\Resources\\ChangeLog.html c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\DEFAULT " + // manifest.xml: aggiorno versNumber ed URL del branch di update... + bat "fart.exe IOB-WIN\\Resources\\manifest.xml 000.000 ${env.versionNumber} || EXIT /B 0" + bat "fart.exe IOB-WIN\\Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0" + // copio ed esporto in IIS02 i vari files .xml, .html, .zip + bat "xcopy /y IOB-WIN\\Resources\\manifest.xml c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME} " + bat "xcopy /y IOB-WIN\\Resources\\ChangeLog.html c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME} " + // // MAPO-IOB-WIN.zip: copio ed esporto in IIS02 // bat "xcopy /y IOB-WIN\\ReleaseClienti\\${env.BRANCH_NAME}\\${env.versionNumber}\\MAPO-IOB-WIN.zip c:\\inetpub\\wwwroot\\SWS\\MAPO-IOB-WIN\\${env.BRANCH_NAME} "