From 59fdba8ce95f27063f2161b21e7289b65ee599d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 4 Jul 2023 16:48:45 +0200 Subject: [PATCH 1/2] GH-35943: [Dev] Ensure link issue works when PR body is empty --- .github/workflows/dev_pr/link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev_pr/link.js b/.github/workflows/dev_pr/link.js index a3e0553c923a9..7bc678b8dfe20 100644 --- a/.github/workflows/dev_pr/link.js +++ b/.github/workflows/dev_pr/link.js @@ -84,7 +84,7 @@ async function commentGitHubURL(github, context, pullRequestNumber, issueID) { 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 (context.payload.pull_request.body != null && context.payload.pull_request.body.includes(message)) { return; } await github.rest.pulls.update({ From 421bb911782561f8db27f74bb406bfe9570652cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Wed, 5 Jul 2023 11:21:47 +0200 Subject: [PATCH 2/2] Apply suggestions to simplify code --- .github/workflows/dev_pr/link.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev_pr/link.js b/.github/workflows/dev_pr/link.js index 7bc678b8dfe20..174bd3bae650a 100644 --- a/.github/workflows/dev_pr/link.js +++ b/.github/workflows/dev_pr/link.js @@ -84,14 +84,15 @@ async function commentGitHubURL(github, context, pullRequestNumber, issueID) { const issueInfo = await helpers.getGitHubInfo(github, context, issueID, pullRequestNumber); const message = "* Closes: #" + issueInfo.number if (issueInfo) { - if (context.payload.pull_request.body != null && context.payload.pull_request.body.includes(message)) { + const body = context.payload.pull_request.body || ""; + if (body.includes(message)) { return; } await github.rest.pulls.update({ owner: context.repo.owner, repo: context.repo.repo, pull_number: pullRequestNumber, - body: (context.payload.pull_request.body || "") + "\n" + message + body: body + "\n" + message }); } }