Publish build results even if MATLAB exited with nonzero exit code

Author: sameagen-MW

src/main/java/com/mathworks/ci/actions/RunMatlabBuildAction.java

@@ -78,20 +78,6 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
 
         try {
             runner.runMatlabCommand(command);
-
-            // Handle build result
-            Run<?,?> build = this.params.getBuild();
-            FilePath jsonFile = new FilePath(runner.getTempFolder(), "buildArtifact.json");
-            if (jsonFile.exists()) {
-                FilePath rootLocation = new FilePath(
-                        new File(
-                            build.getRootDir().getAbsolutePath(),
-                            "buildArtifact.json")
-                        );
-                jsonFile.copyTo(rootLocation);
-                jsonFile.delete();
-                build.addAction(new BuildArtifactAction(build));
-            }
         } catch (Exception e) {
             this.params.getTaskListener().getLogger()
                 .println(e.getMessage());
@@ -100,11 +86,29 @@ public void run() throws IOException, InterruptedException, MatlabExecutionExcep
             annotator.forceEol();
 
             try {
-                this.runner.removeTempFolder();
+                // Handle build result
+                Run<?,?> build = this.params.getBuild();
+                FilePath jsonFile = new FilePath(runner.getTempFolder(), "buildArtifact.json");
+                if (jsonFile.exists()) {
+                    FilePath rootLocation = new FilePath(
+                            new File(
+                                build.getRootDir().getAbsolutePath(),
+                                "buildArtifact.json")
+                            );
+                    jsonFile.copyTo(rootLocation);
+                    jsonFile.delete();
+                    build.addAction(new BuildArtifactAction(build));
+                }
             } catch (Exception e) {
                 // Don't want to override more important error
                 // thrown in catch block
                 System.err.println(e.toString());
+            } finally {
+                try {
+                    this.runner.removeTempFolder();
+                } catch (Exception e) {
+                    System.err.println(e.toString());
+                }
             }
         }
     }

src/test/java/unit/com/mathworks/ci/actions/RunMatlabBuildActionTest.java

@@ -152,15 +152,8 @@ public void shouldCopyBuildResultsToRootAndAddAction() throws IOException, Inter
         doReturn(new FilePath(tmp)).when(runner).getTempFolder();
         doReturn(dest).when(build).getRootDir();
 
-        boolean runTimeException = false;
-        try {
-            action.run();
-        } catch (RuntimeException e) {
-            runTimeException = true;
-        }
+        action.run();
 
-        // Should throw for invalid file
-        assertTrue(runTimeException);
         // Should have deleted original file
         assertFalse(json.exists());
         // Should have copied file to root dir