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

ao-apps · Sep 4, 2023 · 42559af · 42559af
2 parents 36f612d + 33318f9
commit 42559af
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -538,6 +538,9 @@ pipeline {
     quietPeriod(quietPeriod)
     skipDefaultCheckout()
     timeout(time: 2, unit: 'HOURS')
+    // Only allowed to copy build artifacts from self
+    // See https://plugins.jenkins.io/copyartifact/
+    copyArtifactPermission("/${JOB_NAME}")
     // See https://plugins.jenkins.io/build-history-manager/
     buildDiscarder(BuildHistoryManager([
       [
@@ -913,6 +916,17 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
   // Make sure working tree not modified by build or test
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
+    // Download artifacts from last successful build of this job
+    // See https://plugins.jenkins.io/copyartifact/
+    // See https://www.jenkins.io/doc/pipeline/steps/copyartifact/#copyartifacts-copy-artifacts-from-another-project
+    copyArtifacts(
+      projectName: "/${JOB_NAME}",
+      selector: lastSuccessful(stable: false),
+      filter: '**/*.aar, **/*.jar, **/*.war',
+      target: 'target/last-successful-artifacts',
+      flatten: true,
+      optional: true
+    )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()
     withMaven(

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -553,6 +553,9 @@ pipeline {
     quietPeriod(quietPeriod)
     skipDefaultCheckout()
     timeout(time: 2, unit: 'HOURS')
+    // Only allowed to copy build artifacts from self
+    // See https://plugins.jenkins.io/copyartifact/
+    copyArtifactPermission("/${JOB_NAME}")
     // See https://plugins.jenkins.io/build-history-manager/
     buildDiscarder(BuildHistoryManager([
       [
@@ -928,6 +931,17 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
   // Make sure working tree not modified by build or test
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
+    // Download artifacts from last successful build of this job
+    // See https://plugins.jenkins.io/copyartifact/
+    // See https://www.jenkins.io/doc/pipeline/steps/copyartifact/#copyartifacts-copy-artifacts-from-another-project
+    copyArtifacts(
+      projectName: "/${JOB_NAME}",
+      selector: lastSuccessful(stable: false),
+      filter: '**/*.aar, **/*.jar, **/*.war',
+      target: 'target/last-successful-artifacts',
+      flatten: true,
+      optional: true
+    )
     // Temporarily move surefire-reports before withMaven to avoid duplicate logging of test results
     sh moveSurefireReportsScript()
     withMaven(

diff --git a/model b/model
diff --git a/renderer-html b/renderer-html
diff --git a/servlet b/servlet
diff --git a/style b/style
diff --git a/taglib b/taglib
diff --git a/view b/view