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

Merge branch 'MAG' into ES3

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-12-31 13:44:27 +01:00
parent 60f0664595 013d2499de
commit 16bc49560d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+10 -10
View File
@@ -5,7 +5,7 @@ pipeline {
EMAIL_RECIPIENTS = 'samuele@steamware.net'
enableIIS01 = 'Y'
enableIIS02 = 'Y'
singleProj = ['ADM','IO','LAND','MAG','MON','SITE','TAB']
singleProj ='ADM,IO,LAND,MAG,MON,SITE,TAB'
}
stages {
stage('Checkout') {
@@ -64,9 +64,9 @@ pipeline {
},
failFast: false)
}
else if (env.singleProj.contains(env.BRANCH_NAME) {
else if ( env.singleProj.contains(env.BRANCH_NAME) ) {
parallel (
ALL: {
SINGLE: {
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-${env.BRANCH_NAME}/MP-${env.BRANCH_NAME}.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
failFast: false)
@@ -165,13 +165,13 @@ pipeline {
bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
}
// else if (env.singleProj.contains(env.BRANCH_NAME) {
// parallel (
// ALL: {
// bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-${env.BRANCH_NAME}/MP-${env.BRANCH_NAME}.csproj"
// },
// failFast: false)
// }
else if ( env.singleProj.contains(env.BRANCH_NAME) ) {
parallel (
ALL: {
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-${env.BRANCH_NAME}/MP-${env.BRANCH_NAME}.csproj"
},
failFast: false)
}
else {
echo 'Nothing to deploy...'
}
gitSpread.bat
+1 -1
View File
@@ -12,12 +12,12 @@ set pushRemote=%2
git push . %baseBranch%:beta
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 )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:%baseBranch% )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:beta )
if %pushRemote% GTR 0 ( git push gitlab.steamware %baseBranch%:develop )