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

ao-apps · Sep 19, 2023 · 2e0153e · 2e0153e
2 parents f251bfd + 1abb09f
commit 2e0153e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -698,6 +698,7 @@ or any build that adds or removes build artifacts."""
         }
       }
       steps {
+        // See https://www.jenkins.io/doc/pipeline/steps/params/gitscm/
         // See https://www.jenkins.io/doc/pipeline/steps/workflow-scm-step/#checkout-check-out-from-version-control
         // See https://stackoverflow.com/questions/43293334/sparsecheckout-in-jenkinsfile-pipeline
         /*
@@ -725,17 +726,17 @@ or any build that adds or removes build artifacts."""
               // [$class: 'CleanCheckout'],
               [$class: 'CloneOption',
                 // See https://issues.jenkins.io/browse/JENKINS-45586
-                shallow: true,
-                depth: 20,
+                shallow: false,
+                // depth: 20,
                 honorRefspec: true
               ],
               [$class: 'SparseCheckoutPaths',
                 sparseCheckoutPaths: sparseCheckoutPaths
               ],
               [$class: 'SubmoduleOption',
                 disableSubmodules: disableSubmodules,
-                shallow: true,
-                depth: 20
+                shallow: false
+                // depth: 20
               ]
             ]
           ]
@@ -765,17 +766,17 @@ or any build that adds or removes build artifacts."""
             // [$class: 'CleanCheckout'],
             [$class: 'CloneOption',
               // See https://issues.jenkins.io/browse/JENKINS-45586
-              shallow: true,
-              depth: 20,
+              shallow: false,
+              // depth: 20,
               honorRefspec: true
             ],
             [$class: 'SparseCheckoutPaths',
               sparseCheckoutPaths: sparseCheckoutPaths
             ],
             [$class: 'SubmoduleOption',
               disableSubmodules: disableSubmodules,
-              shallow: true,
-              depth: 20
+              shallow: false
+              // depth: 20
             ]
           ]
         ]
@@ -990,7 +991,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
 void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
-  sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
+  // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(

diff --git a/book/Jenkinsfile b/book/Jenkinsfile
@@ -695,6 +695,7 @@ or any build that adds or removes build artifacts."""
         }
       }
       steps {
+        // See https://www.jenkins.io/doc/pipeline/steps/params/gitscm/
         // See https://www.jenkins.io/doc/pipeline/steps/workflow-scm-step/#checkout-check-out-from-version-control
         // See https://stackoverflow.com/questions/43293334/sparsecheckout-in-jenkinsfile-pipeline
         /*
@@ -722,17 +723,17 @@ or any build that adds or removes build artifacts."""
               // [$class: 'CleanCheckout'],
               [$class: 'CloneOption',
                 // See https://issues.jenkins.io/browse/JENKINS-45586
-                shallow: true,
-                depth: 20,
+                shallow: false,
+                // depth: 20,
                 honorRefspec: true
               ],
               [$class: 'SparseCheckoutPaths',
                 sparseCheckoutPaths: sparseCheckoutPaths
               ],
               [$class: 'SubmoduleOption',
                 disableSubmodules: disableSubmodules,
-                shallow: true,
-                depth: 20
+                shallow: false
+                // depth: 20
               ]
             ]
           ]
@@ -762,17 +763,17 @@ or any build that adds or removes build artifacts."""
             // [$class: 'CleanCheckout'],
             [$class: 'CloneOption',
               // See https://issues.jenkins.io/browse/JENKINS-45586
-              shallow: true,
-              depth: 20,
+              shallow: false,
+              // depth: 20,
               honorRefspec: true
             ],
             [$class: 'SparseCheckoutPaths',
               sparseCheckoutPaths: sparseCheckoutPaths
             ],
             [$class: 'SubmoduleOption',
               disableSubmodules: disableSubmodules,
-              shallow: true,
-              depth: 20
+              shallow: false
+              // depth: 20
             ]
           ]
         ]
@@ -987,7 +988,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
 void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
-  sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
+  // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(