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

ao-apps · Sep 20, 2023 · 88a6755 · 88a6755
2 parents 1fe97e1 + 75fce40
commit 88a6755
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -60,10 +60,6 @@ def upstreamProjects = [
  *                          'book/Jenkinsfile'  -> 'book'                                 *
  *                          'devel/Jenkinsfile' -> 'devel'                                *
  *                                                                                        *
- * abortOnUnreadyDependency  Aborts the build when any dependency is queued, building,    *
- *                           or unsuccessful.                                             *
- *                           Defaults to true                                             *
- *                                                                                        *
  * disableSubmodules    Disables checkout of Git submodules.                              *
  *                      Defaults to true                                                  *
  *                                                                                        *
@@ -169,9 +165,6 @@ if (!binding.hasVariable('projectDir')) {
   }
   binding.setVariable('projectDir', projectDir)
 }
-if (!binding.hasVariable('abortOnUnreadyDependency')) {
-  binding.setVariable('abortOnUnreadyDependency', true)
-}
 if (!binding.hasVariable('disableSubmodules')) {
   binding.setVariable('disableSubmodules', true)
 }
@@ -584,6 +577,13 @@ pipeline {
       defaultValue: "$buildPriority",
       description: """Specify the priority of this build.
 Defaults to project's depth in the upstream project graph."""
+    )
+    booleanParam(
+      name: 'abortOnUnreadyDependency',
+      defaultValue: true,
+      description: """Aborts the build when any dependency is queued, building, or unsuccessful.
+Defaults to true and will typically only be false to push a new version of a project out immediately.
+May also want to set BuildPriority to \"1\" to put at the top of the build queue."""
     )
     booleanParam(
       name: 'requireLastBuild',
@@ -603,7 +603,7 @@ or any build that adds or removes build artifacts."""
     stage('Check Ready') {
       when {
         expression {
-          return abortOnUnreadyDependency
+          return params.abortOnUnreadyDependency
         }
       }
       steps {

diff --git a/all b/all
diff --git a/bom b/bom
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -75,10 +75,6 @@ def upstreamProjects = [
  *                          'book/Jenkinsfile'  -> 'book'                                 *
  *                          'devel/Jenkinsfile' -> 'devel'                                *
  *                                                                                        *
- * abortOnUnreadyDependency  Aborts the build when any dependency is queued, building,    *
- *                           or unsuccessful.                                             *
- *                           Defaults to true                                             *
- *                                                                                        *
  * disableSubmodules    Disables checkout of Git submodules.                              *
  *                      Defaults to true                                                  *
  *                                                                                        *
@@ -184,9 +180,6 @@ if (!binding.hasVariable('projectDir')) {
   }
   binding.setVariable('projectDir', projectDir)
 }
-if (!binding.hasVariable('abortOnUnreadyDependency')) {
-  binding.setVariable('abortOnUnreadyDependency', true)
-}
 if (!binding.hasVariable('disableSubmodules')) {
   binding.setVariable('disableSubmodules', true)
 }
@@ -599,6 +592,13 @@ pipeline {
       defaultValue: "$buildPriority",
       description: """Specify the priority of this build.
 Defaults to project's depth in the upstream project graph."""
+    )
+    booleanParam(
+      name: 'abortOnUnreadyDependency',
+      defaultValue: true,
+      description: """Aborts the build when any dependency is queued, building, or unsuccessful.
+Defaults to true and will typically only be false to push a new version of a project out immediately.
+May also want to set BuildPriority to \"1\" to put at the top of the build queue."""
     )
     booleanParam(
       name: 'requireLastBuild',
@@ -618,7 +618,7 @@ or any build that adds or removes build artifacts."""
     stage('Check Ready') {
       when {
         expression {
-          return abortOnUnreadyDependency
+          return params.abortOnUnreadyDependency
         }
       }
       steps {

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