Update base command computation

neoforged · Aug 11, 2024 · 1487d0d · 1487d0d
1 parent 7b2e9c2
commit 1487d0d
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/main/java/net/neoforged/automation/command/FormattingCommand.java b/src/main/java/net/neoforged/automation/command/FormattingCommand.java
@@ -18,9 +18,16 @@
 public class FormattingCommand {
 
     public static void run(GitHub gh, GHPullRequest pr, Configuration.PRActions actions, Configuration.RepoConfiguration repoConfiguration, String command, Consumer<GHWorkflowRun> onFailure, Runnable onSuccess) throws IOException {
+        var command2 = command;
+        var baseCommand = repoConfiguration.baseRunCommand();
+        if (baseCommand.split("\n").length > 1) {
+            var spl = baseCommand.split("\n", 2);
+            baseCommand = spl[0].trim();
+            command2 = spl[1].trim() + " && " + command2;
+        }
         PRActionRunner.builder(pr)
                 .upload(repoConfiguration.runUploadPattern())
-                .command(repoConfiguration.baseRunCommand(), command)
+                .command(baseCommand, command2)
                 .onFailed((gitHub, run) -> onFailure.accept(run))
                 .onFinished((gitHub, run, artifact) -> {
                     PRRunUtils.setupPR(pr, (dir, git) -> {