copyArtifacts changes: only use stable, required when params.requireL…

…astBuild
ao-apps · Sep 8, 2023 · 4d79deb · 4d79deb
1 parent 96745bc
commit 4d79deb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -966,11 +966,11 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     // See https://www.jenkins.io/doc/pipeline/steps/copyartifact/#copyartifacts-copy-artifacts-from-another-project
     copyArtifacts(
       projectName: "/${JOB_NAME}",
-      selector: lastSuccessful(stable: false),
+      selector: lastSuccessful(stable: true),
       filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
-      optional: true
+      optional: !params.requireLastBuild
     )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -947,11 +947,11 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     // See https://www.jenkins.io/doc/pipeline/steps/copyartifact/#copyartifacts-copy-artifacts-from-another-project
     copyArtifacts(
       projectName: "/${JOB_NAME}",
-      selector: lastSuccessful(stable: false),
+      selector: lastSuccessful(stable: true),
       filter: '**/*.aar, **/*.jar, **/*.war, **/*.zip',
       target: 'target/last-successful-artifacts',
       flatten: true,
-      optional: true
+      optional: !params.requireLastBuild
     )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()