New ${devMode} property

that will be true only when the "development" profile is active. "publish" profile may not be activated at the same time as "development" profile.
ao-apps · Sep 17, 2023 · 6ca5331 · 6ca5331
1 parent e38f154
commit 6ca5331
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -965,7 +965,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
@@ -969,7 +969,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()