Merge remote-tracking branch 'origin/1.x'

ao-apps · Sep 17, 2023 · 850922d · 850922d
2 parents f2f70e6 + b48e0e1
commit 850922d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -958,7 +958,16 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
+      // "publish" profile may not be enabled at the same time as "development" profile,
+      // disable for any project that always has "development" profile enabled.
+      sh """#!/bin/bash
+if [ -f profile.d/development ]
+then
+  ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy deploy
+else
+  ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy
+fi
+"""
     }
     // Restore surefire-reports
     sh restoreSurefireReportsScript()

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -964,7 +964,16 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
-      sh "${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy"
+      // "publish" profile may not be enabled at the same time as "development" profile,
+      // disable for any project that always has "development" profile enabled.
+      sh """#!/bin/bash
+if [ -f profile.d/development ]
+then
+  ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy deploy
+else
+  ${niceCmd}$MVN_CMD $mvnCommon -Pnexus,jenkins-deploy,publish deploy
+fi
+"""
     }
     // Restore surefire-reports
     sh restoreSurefireReportsScript()