From 982269d7f22443d48a37a3a6ebc8f56a18e04271 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Wed, 3 Mar 2021 10:02:27 +0100
Subject: [PATCH] fix gitspread e jenkinsfile

---
 Jenkinsfile   |  3 +--
 gitSpread.bat | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 0f1f2c98..46b27c9e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
       steps {
       /* calcolo numero versione... diverso x branch MASTER/DEVELOP */
       script {
-        withEnv(['NEXT_BUILD_NUMBER=1394']) {
+        withEnv(['NEXT_BUILD_NUMBER=1395']) {
           // env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
           env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
           env.APP_NAME = 'MAPO'
@@ -44,7 +44,6 @@ pipeline {
           bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
           // checkout NuGet in file sorgente!!!
           fixNuget("${WORKSPACE}\\MAPO.sln")
-          // bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln"
         }
         script {
           /* compilo installers in base al BRANCH del cliente... */
diff --git a/gitSpread.bat b/gitSpread.bat
index eb408077..d571a63f 100644
--- a/gitSpread.bat
+++ b/gitSpread.bat
@@ -15,9 +15,9 @@ git push . %baseBranch%:develop
 git push gitlab.steamware %baseBranch%:%baseBranch%
 
 REM Faccio push remoto condizionale
-if %pushRemote% GTR 0 ( git push . %baseBranch%:ES3 )
-if %pushRemote% GTR 0 ( git push . %baseBranch%:Giancarlo )
-if %pushRemote% GTR 0 ( git push . %baseBranch%:MongoDb )
+@REM if %pushRemote% GTR 0 ( git push . %baseBranch%:ES3 )
+@REM if %pushRemote% GTR 0 ( git push . %baseBranch%:Giancarlo )
+@REM if %pushRemote% GTR 0 ( git push . %baseBranch%:MongoDb )
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:beta )
 if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )
 
@@ -25,9 +25,9 @@ if %pushRemote% GTR 1 ( git push . %baseBranch%:ADM )
 if %pushRemote% GTR 1 ( git push . %baseBranch%:MAG )
 if %pushRemote% GTR 1 ( git push . %baseBranch%:TAB )
 if %pushRemote% GTR 1 ( git push . %baseBranch%:SDK )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:ES3 )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:Giancarlo )
-if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:MongoDb )
+@REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:ES3 )
+@REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:Giancarlo )
+@REM if %pushRemote% GTR 1 ( git push gitlab.steamware %baseBranch%:MongoDb )
 
 if %pushRemote% GTR 2 ( git push . %baseBranch%:master )
 if %pushRemote% GTR 2 ( git push . %baseBranch%:stable )