Merge 121e148 into e4d7c90

uber-archive · Oct 9, 2018 · c8bd7e8 · c8bd7e8
2 parents e4d7c90 + 121e148
commit c8bd7e8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/src/main/java/com/uber/jenkins/phabricator/CommentBuilder.java b/src/main/java/com/uber/jenkins/phabricator/CommentBuilder.java
@@ -133,7 +133,7 @@ void processBuildResult(
             boolean commentOnSuccess,
             boolean commentWithConsoleLinkOnFailure,
             boolean runHarbormaster) {
-        if (result == Result.SUCCESS) {
+        if (result == Result.SUCCESS || result == null) {
             if (comment.length() == 0 && (commentOnSuccess || !runHarbormaster)) {
                 comment.append("Build is green");
             }

diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/CoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/CoverageProvider.java
@@ -27,7 +27,6 @@
 import javax.annotation.Nullable;
 
 import hudson.FilePath;
-import hudson.model.AbstractBuild;
 import hudson.model.Run;
 
 public abstract class CoverageProvider {

diff --git a/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoCoverageProvider.java b/src/main/java/com/uber/jenkins/phabricator/coverage/JacocoCoverageProvider.java
@@ -9,19 +9,17 @@
 import org.jacoco.core.analysis.ISourceNode;
 
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import hudson.FilePath;
-import hudson.model.AbstractBuild;
-import hudson.model.Project;
 import hudson.model.Run;
 import hudson.plugins.jacoco.ExecutionFileLoader;
 import hudson.plugins.jacoco.JacocoBuildAction;
-import hudson.plugins.jacoco.JacocoPublisher;
 import hudson.plugins.jacoco.report.CoverageReport;
 
 /**
@@ -115,29 +113,28 @@ private JacocoBuildAction getJacocoBuildAction() {
         return build.getAction(JacocoBuildAction.class);
     }
 
-    private JacocoPublisher getJacocoPublisher() {
-        Project<?, ?> project = (Project<?, ?>) ((AbstractBuild) build).getProject();
-        return (JacocoPublisher) project.getPublisher(JacocoPublisher.DESCRIPTOR);
-    }
-
     @Override
     public Map<String, List<Integer>> readLineCoverage() {
         JacocoBuildAction jacocoAction = getJacocoBuildAction();
-        JacocoPublisher jacocoPublisher = getJacocoPublisher();
-        if (jacocoAction == null || jacocoPublisher == null) {
+
+        if (jacocoAction == null) {
             return null;
         }
 
         HashMap<String, List<Integer>> lineCoverage = new HashMap<String, List<Integer>>();
 
         String[] includes = null;
-        if (jacocoPublisher.getInclusionPattern() != null) {
-            includes = new String[] {jacocoPublisher.getInclusionPattern()};
-        }
-
         String[] excludes = null;
-        if (jacocoPublisher.getExclusionPattern() != null) {
-            excludes = new String[] {jacocoPublisher.getExclusionPattern()};
+
+        try {
+            Field inclusionsField = JacocoBuildAction.class.getDeclaredField("inclusions");
+            inclusionsField.setAccessible(true);
+            includes = (String[]) inclusionsField.get(jacocoAction);
+            Field exclusionsField = JacocoBuildAction.class.getDeclaredField("exclusions");
+            exclusionsField.setAccessible(true);
+            excludes = (String[]) exclusionsField.get(jacocoAction);
+        } catch (Exception e) {
+            e.printStackTrace();
         }
 
         try {