Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2020-02-18 16:28:49 +01:00
Vendored
+29 -29
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=76']) {
withEnv(['NEXT_BUILD_NUMBER=77']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.2.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'ZCode'
@@ -58,6 +58,33 @@ pipeline {
}
}
}
stage('Deploy') {
agent any
steps {
script {
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\VersGen.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0"
fixNuget("${WORKSPACE}\\ZebraCode.sln")
}
script {
/* DEPLOY condizionale: develop (Ufficio Seriate) / master (Sito Online) */
if (env.BRANCH_NAME == "master") {
if(env.enableIIS01 == "Y")
{
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
}
else if (env.BRANCH_NAME == "ovh") {
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=OVH /p:username=WPROD01\\Steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
else
{
echo 'Questo BRANCH non necessita di deploy...'
}
}
}
}
stage('Installers') {
agent any
steps {
@@ -91,7 +118,7 @@ pipeline {
[
artifactId: 'ZCode',
classifier: "${env.classifier}",
file: "ReleaseClienti\\${env.BRANCH_NAME}\\ZCode.zip",
file: "ZCode\\ReleaseClienti\\${env.BRANCH_NAME}\\ZCode.zip",
type: 'zip'
]
],
@@ -110,33 +137,6 @@ pipeline {
}
}
}
stage('Deploy') {
agent any
steps {
script {
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "e:\\fart.exe ${WORKSPACE}\\VersGen\\VersGen.cs 0.0.0.0 ${env.versionNumber} || EXIT /B 0"
fixNuget("${WORKSPACE}\\ZebraCode.sln")
}
script {
/* DEPLOY condizionale: develop (Ufficio Seriate) / master (Sito Online) */
if (env.BRANCH_NAME == "master") {
if(env.enableIIS01 == "Y")
{
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
}
else if (env.BRANCH_NAME == "ovh") {
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=OVH-PROD.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=OVH /p:username=WPROD01\\Steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ ZCode\\ZCode.csproj"
}
else
{
echo 'Questo BRANCH non necessita di deploy...'
}
}
}
}
}
post {
success {