From 4317e526fa6d849ad4a135cf0e859bbf9b114185 Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 03:52:59 -0700 Subject: [PATCH 1/6] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6ba7ec8..c5d3d73 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -182,7 +182,7 @@ pipeline { }*/ stage('Publish') { steps { - sh 'dotnet publish ${WORKSPACE}/bizgaze/Bizgaze.Web.Server.publish.sln -o out --configuration Release --no-restore' + sh 'dotnet publish ${WORKSPACE} -o out --configuration Release --no-restore' } } From 38e370fdff4aa3fbd07292f9b608dbb8b04dec6f Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 03:58:59 -0700 Subject: [PATCH 2/6] fix --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5d3d73..f2046cc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -182,7 +182,7 @@ pipeline { }*/ stage('Publish') { steps { - sh 'dotnet publish ${WORKSPACE} -o out --configuration Release --no-restore' + sh 'dotnet publish ${WORKSPACE}/bizgaze/Bizgaze.Web.Server.publish.sln -o out --configuration Release --no-restore' } } @@ -197,12 +197,12 @@ pipeline { emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" - } + }/* always { deleteDir() } cleanup { cleanWs() - } + }*/ } } From 780ed2ff29f33780fdb2c514ae7853e0a1c66072 Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 07:22:40 -0700 Subject: [PATCH 3/6] fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f2046cc..6ba7ec8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -197,12 +197,12 @@ pipeline { emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" - }/* + } always { deleteDir() } cleanup { cleanWs() - }*/ + } } } From 96549e92d7bc4ac667442ea753f263bd9836e470 Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 10:59:12 -0700 Subject: [PATCH 4/6] fix --- Bizgaze.Web.Server.publish.sln | 2 +- Jenkinsfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bizgaze.Web.Server.publish.sln b/Bizgaze.Web.Server.publish.sln index 7b4f3ea..6745801 100644 --- a/Bizgaze.Web.Server.publish.sln +++ b/Bizgaze.Web.Server.publish.sln @@ -155,7 +155,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Platform.Server.publish", " EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Collaboration", "Collaboration", "{458C3C01-1A87-4328-A474-F17D876C4DB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Collaboration.UniCloud.Publish", "..\unidrive\Collaboration.Providers\Collaboration.UniCloud.Publish.csproj", "{87802CD7-E365-4423-A458-3BC71CFF9330}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Collaboration.UniCloud.Publish", "..\unidrive\collaboration.providers\Collaboration.Providers\Collaboration.UniCloud.Publish.csproj", "{87802CD7-E365-4423-A458-3BC71CFF9330}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPRL", "SPRL", "{15B1D139-3E47-415F-8D8A-D5D532D6E3FC}" EndProject diff --git a/Jenkinsfile b/Jenkinsfile index 6ba7ec8..33097fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -154,7 +154,7 @@ pipeline { dir('uniconnect') { git url: 'git@code.bizgaze.com:unibase/uniconnect.git', credentialsId: 'jenkins_ssh_key' } - dir('unidrive') { + dir('unidrive/collaboration.providers') { git url: 'git@code.bizgaze.com:unidrive/collaboration.git', credentialsId: 'jenkins_ssh_key' } dir('sprl') { @@ -188,7 +188,7 @@ pipeline { } stage ('Deploy') { steps { - sh 'sudo ~/scripts/qa_deploy ${WORKSPACE}/out' + sh 'sudo ~/scripts/v3_deploy ${WORKSPACE}/out' } } } From f4464e639de2d8b25af4ab0c46f8823ad118f2d9 Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 16:09:08 -0700 Subject: [PATCH 5/6] fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 33097fa..b6ad725 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -197,12 +197,12 @@ pipeline { emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" - } + }/* always { deleteDir() } cleanup { cleanWs() - } + }*/ } } From 33c2405651db9ff00201181a1b7d0fb7b71b799b Mon Sep 17 00:00:00 2001 From: Matvey Date: Wed, 4 Aug 2021 16:39:17 -0700 Subject: [PATCH 6/6] fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b6ad725..33097fa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -197,12 +197,12 @@ pipeline { emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", recipientProviders: [[$class: 'DevelopersRecipientProvider'], [$class: 'RequesterRecipientProvider']], subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" - }/* + } always { deleteDir() } cleanup { cleanWs() - }*/ + } } }