From 52d54fd318262e7eb767b8471103101d0c7d297a Mon Sep 17 00:00:00 2001 From: "AO Industries, Inc" Date: Thu, 21 Sep 2023 07:16:45 +0000 Subject: [PATCH] Skip some steps in the "Build" phase on a JDK other than the deployJdk --- Jenkinsfile | 2 +- book/Jenkinsfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68b3693..830ee13 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -808,7 +808,7 @@ or any build that adds or removes build artifacts.""" mavenLocalRepo: ".m2/repository-jdk-$jdk", jdk: "jdk-$jdk" ) { - sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk "}$buildPhases" + sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk -Pjenkins-build-altjdk "}$buildPhases" } } script { diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 70f7c73..71ee6b4 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -804,7 +804,7 @@ or any build that adds or removes build artifacts.""" mavenLocalRepo: ".m2/repository-jdk-$jdk", jdk: "jdk-$jdk" ) { - sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk "}$buildPhases" + sh "${niceCmd}$MVN_CMD $mvnCommon ${jdk == deployJdk ? '' : "-Dalt.build.dir=target-jdk-$jdk -Pjenkins-build-altjdk "}$buildPhases" } } script {