Egalware/admodelling.org
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ovh

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-11-10 12:15:56 +01:00
parent 2a563fbb33 630888620c
commit 696f00959c
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
INTERFACE/WebLCP/Properties/PublishProfiles/OVH-prod.pubxml → INTERFACE/WebLCP/Properties/PublishProfiles/OVH.pubxml
View File
INTERFACE/WebLCP/WebLCP.csproj
+1 -1
View File
@@ -297,7 +297,6 @@
<Content Include="logs\PlaceHolder.file" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<None Include="Properties\PublishProfiles\OVH-prod.pubxml" />
<Content Include="results\PlaceHolder.file" />
<Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" />
@@ -316,6 +315,7 @@
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
<Content Include="Scripts\bootstrap.bundle.js.map" />
<None Include="Properties\PublishProfiles\OVH.pubxml" />
<None Include="Scripts\jquery-3.5.1.intellisense.js" />
<Content Include="Scripts\jquery-3.5.1.js" />
<Content Include="Scripts\jquery-3.5.1.min.js" />
Jenkinsfile
Vendored
+7 -13
View File
@@ -9,15 +9,9 @@ pipeline {
stage('Checkout') {
agent any
steps {
/* build delle SteamWare libs! */
/* build 'SteamWare/SteamWareLib' */
/* copio le libs...*/
// mirroring directory x SteamWare Libs
// bat "robocopy /MIR ..\\..\\SteamWare\\SteamWareLib ..\\SteamWare\\SteamWareLib || EXIT /B 0"
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=89']) {
withEnv(['NEXT_BUILD_NUMBER=90']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'LCP'
@@ -50,7 +44,7 @@ pipeline {
}
script {
/* compilo installers in base al BRANCH del cliente... */
if (env.BRANCH_NAME == "develop") {
if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME == "master") {
parallel (
MAIN_SITE: {
sleep 0
@@ -74,28 +68,28 @@ pipeline {
fixNuget("${WORKSPACE}\\INTERFACE\\WebLCP.sln")
}
script {
/* DEPLOY condizionale: develop (Ufficio Seriate) / master (Sito Online) */
/* DEPLOY condizionale: master (Ufficio Seriate) / ovh (Sito Online) */
if (env.BRANCH_NAME == "master") {
parallel (
IIS_01: {
if(env.enableIIS01 == "Y")
{
sleep 5
// SITE
bat "\"${tool 'MSBuild-16.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/ INTERFACE\\WebLCP\\WebLCP.csproj"
bat "\"${tool 'MSBuild-16.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=16.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ INTERFACE\\WebLCP\\WebLCP.csproj"
}
},
IIS_02: {
if(env.enableIIS02 == "Y")
{
sleep 5
// SITE
bat "\"${tool 'MSBuild-16.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=IIS02.pubxml /p:VisualStudioVersion=15.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ INTERFACE\\WebLCP\\WebLCP.csproj"
bat "\"${tool 'MSBuild-16.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=IIS02.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ INTERFACE\\WebLCP\\WebLCP.csproj"
}
},
failFast: false)
}
else if (env.BRANCH_NAME == "ovh") {
bat "\"${tool 'MSBuild-16.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=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ INTERFACE\\WebLCP\\WebLCP.csproj"
bat "\"${tool 'MSBuild-16.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.pubxml /p:VisualStudioVersion=16.0 /p:RunCodeAnalysis=false /p:Configuration=OVH /p:username=steamware /p:Password=viaD@nte16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ INTERFACE\\WebLCP\\WebLCP.csproj"
}
else
{