From 0e7abb13ae894fccdbfcf7cc9be35ffa6492f7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 4 Jul 2023 17:07:32 +0200 Subject: [PATCH 1/2] GH-35943: [Dev] Ensure link issue works when PR body is empty (#80) --- .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 a3e0553c923..7bc678b8dfe 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 5e2e8320799169dba112b9c4f78cf39863b06e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Cumplido?= Date: Tue, 4 Jul 2023 17:08:01 +0200 Subject: [PATCH 2/2] Update merge_arrow_pr.py --- dev/merge_arrow_pr.py | 1 + 1 file changed, 1 insertion(+) diff --git a/dev/merge_arrow_pr.py b/dev/merge_arrow_pr.py index 90b2e9b034e..6b5de253204 100755 --- a/dev/merge_arrow_pr.py +++ b/dev/merge_arrow_pr.py @@ -62,6 +62,7 @@ os.environ.get("PR_REMOTE_NAME") or # backward compatibility "apache" ) +# test PROJECT_NAME = os.environ.get('ARROW_PROJECT_NAME') or "arrow" # For testing to avoid accidentally pushing to apache