Fix cases where we would unintentionally tar the entire build workspa…

…ce (#49130) Fix cases where we would unintentionally tar the entire build workspace
miamia1999 · Nov 15, 2019 · 69e69f5 · 69e69f5
1 parent de8107e
commit 69e69f5
Showing 1 changed file with 19 additions and 11 deletions.
diff --git a/gradle/build-complete.gradle b/gradle/build-complete.gradle
@@ -13,18 +13,26 @@ if (buildNumber) {
     try {
       ant.tar(destfile: uploadFile, compression: "bzip2", longfile: "gnu") {
         fileset(dir: projectDir) {
-          fileTree(projectDir)
-            .include("**/*.hprof")
-            .include("**/reaper.log")
-            .include("**/build/testclusters/**")
-            .exclude("**/build/testclusters/**/data/**")
-            .exclude("**/build/testclusters/**/distro/**")
-            .exclude("**/build/testclusters/**/repo/**")
-            .exclude("**/build/testclusters/**/extract/**")
-            .filter { Files.isRegularFile(it.toPath()) }
-            .each {
-              include(name: projectDir.toPath().relativize(it.toPath()))
+          Set<File> fileSet = fileTree(projectDir) {
+            include("**/*.hprof")
+            include("**/reaper.log")
+            include("**/build/testclusters/**")
+            exclude("**/build/testclusters/**/data/**")
+            exclude("**/build/testclusters/**/distro/**")
+            exclude("**/build/testclusters/**/repo/**")
+            exclude("**/build/testclusters/**/extract/**")
+          }
+            .files
+            .findAll { Files.isRegularFile(it.toPath()) }
+
+          if (fileSet.empty) {
+            // In cases where we don't match any workspace files, exclude everything
+            ant.exclude(name: "**/*")
+          } else {
+            fileSet.each {
+              ant.include(name: projectDir.toPath().relativize(it.toPath()))
             }
+          }
         }
 
         fileset(dir: "${gradle.gradleUserHomeDir}/daemon/${gradle.gradleVersion}", followsymlinks: false) {