Remove label from merged PRs after backport

Author: Matyrobbrt

action-runner/dist/index.js

@@ -103,7 +103,7 @@ export async function onMessage(ws: WebSocket, msg: any) {
   } else if (json.type == 'save-cache') {
     const ch = await cache.saveCache(json.paths, json.key).catch(_ => undefined)
     if (ch == undefined) {
-      console.log(`Cache could not be saved`)
+      console.error(`Cache could not be saved`)
       ws.send(JSON.stringify({id: -1}))
     } else {
       console.log(`Saved cache from ` + json.paths + ` as ` + json.key)

action-runner/src/main.ts

@@ -14,7 +14,8 @@
 import java.util.Set;
 
 public record BackportHandler(String version) implements LabelHandler {
-    private static final Set<Integer> RUNNING_PRS = Collections.synchronizedSet(new HashSet<>());
+    private record PRRun(int number, String backportBranch) {}
+    private static final Set<PRRun> RUNNING_PRS = Collections.synchronizedSet(new HashSet<>());
 
     @Override
     public void onLabelAdded(GitHub gitHub, GHUser actor, GHIssue issue, GHLabel label) throws Exception {
@@ -23,7 +24,7 @@ public void onLabelAdded(GitHub gitHub, GHUser actor, GHIssue issue, GHLabel lab
             if (version().equals(pr.getBase().getRef())) {
                 pr.removeLabel(label.getName());
             } else {
-                RUNNING_PRS.add(pr.getNumber());
+                RUNNING_PRS.add(new PRRun(pr.getNumber(), version()));
                 run(gitHub, pr, actor, label);
             }
         } else {
@@ -34,7 +35,7 @@ public void onLabelAdded(GitHub gitHub, GHUser actor, GHIssue issue, GHLabel lab
     @Override
     public void onSynchronized(GitHub gitHub, GHUser actor, GHPullRequest pullRequest, GHLabel label) throws Exception {
         Main.scheduleUntil(() -> {
-            if (RUNNING_PRS.add(pullRequest.getNumber())) {
+            if (RUNNING_PRS.add(new PRRun(pullRequest.getNumber(), version()))) {
                 run(gitHub, pullRequest, actor, label);
                 return true;
             }
@@ -48,7 +49,7 @@ private void run(GitHub gitHub, GHPullRequest pr, GHUser source, GHLabel label)
                 gitHub, pr,
                 Configuration.get(), version,
                 (runner, err) -> {
-                    RUNNING_PRS.remove(pr.getNumber());
+                    RUNNING_PRS.remove(new PRRun(pr.getNumber(), version()));
 
                     try {
                         var message = new StringBuilder();
@@ -65,11 +66,16 @@ private void run(GitHub gitHub, GHPullRequest pr, GHUser source, GHLabel label)
                     }
                 },
                 createdPr -> {
-                    RUNNING_PRS.remove(pr.getNumber());
+                    RUNNING_PRS.remove(new PRRun(pr.getNumber(), version()));
 
                     if (createdPr != null) {
                         pr.comment("Created backport PR: #" + createdPr.getNumber());
                     }
+
+                    // If the PR is merged then it's not going to have further updates so we can remove the label
+                    if (pr.isMerged()) {
+                        pr.removeLabel(label.getName());
+                    }
                 },
                 Set.of(label.getName())
         );