From ed58d790cb7e8465ebb56d8536aa3e7a53ba9dad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Sun, 28 May 2023 17:01:43 +0200 Subject: [PATCH 1/2] GH-14790: [Dev] Avoid extra comment with Closes XXXX on PRs --- .github/workflows/dev_pr/link.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/dev_pr/link.js b/.github/workflows/dev_pr/link.js index 1fbd0447175..94843bbcc8c 100644 --- a/.github/workflows/dev_pr/link.js +++ b/.github/workflows/dev_pr/link.js @@ -83,22 +83,16 @@ async function commentGitHubURL(github, context, pullRequestNumber, issueID) { // Make the call to ensure issue exists before adding comment const issueInfo = await helpers.getGitHubInfo(github, context, issueID, pullRequestNumber); const message = "* Closes: #" + issueInfo.number - if (await haveComment(github, context, pullRequestNumber, message)) { - return; - } if (issueInfo){ + if (context.payload.pull_request.body.includes(message)){ + return; + } await github.pulls.update({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pullRequestNumber, body: (context.payload.pull_request.body || "") + "\n" + message }); - await github.issues.createComment({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: pullRequestNumber, - body: message - }); } } From 41e4b2475565d3481e50432040fcf5965df3a281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 30 May 2023 10:28:59 +0200 Subject: [PATCH 2/2] Update .github/workflows/dev_pr/link.js Co-authored-by: Sutou Kouhei --- .github/workflows/dev_pr/link.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_pr/link.js b/.github/workflows/dev_pr/link.js index 94843bbcc8c..05e6a85a877 100644 --- a/.github/workflows/dev_pr/link.js +++ b/.github/workflows/dev_pr/link.js @@ -83,8 +83,8 @@ async function commentGitHubURL(github, context, pullRequestNumber, issueID) { // Make the call to ensure issue exists before adding comment const issueInfo = await helpers.getGitHubInfo(github, context, issueID, pullRequestNumber); const message = "* Closes: #" + issueInfo.number - if (issueInfo){ - if (context.payload.pull_request.body.includes(message)){ + if (issueInfo) { + if (context.payload.pull_request.body.includes(message)) { return; } await github.pulls.update({