delete comment if no conflicts anymore

ss220club · Aug 15, 2024 · 1ad19c0 · 1ad19c0
1 parent 1cfb46b
commit 1ad19c0
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/.github/workflows/detect_translate_conflicts.yml b/.github/workflows/detect_translate_conflicts.yml
@@ -44,10 +44,6 @@ jobs:
           script: |
                   const { MERGE_CONFLICTS } = process.env;
 
-                  if (!MERGE_CONFLICTS) {
-                    return;
-                  }
-
                   const conflict_message_header = "This PR causes following conflicts on translate branch:\n";
                   const issue_body = `${conflict_message_header}${MERGE_CONFLICTS}`;
 
@@ -58,16 +54,26 @@ jobs:
                   });
 
                   const action_comment = comments.data.find(comment => comment.body.startsWith(conflict_message_header) && comment.user.login === "github-actions[bot]");
+
                   if (action_comment) {
                     const comment_id = action_comment.id;
 
+                    if (!MERGE_CONFLICTS) {
+                      await github.rest.issues.deleteComment({
+                        owner: context.repo.owner,
+                        repo: context.repo.repo,
+                        comment_id: comment_id,
+                      });
+                      return;
+                    }
+
                     await github.rest.issues.updateComment({
                       owner: context.repo.owner,
                       repo: context.repo.repo,
                       comment_id: comment_id,
                       body: issue_body,
                     });
-                  } else {
+                  } else if (MERGE_CONFLICTS) {
                     await github.rest.issues.createComment({
                       owner: context.repo.owner,
                       repo: context.repo.repo,