diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 3e772b0..b04936d 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -25,4 +25,4 @@ jobs: const mergebot = require('./.github/workflows/merge.js'); const branch = await mergebot.checkChanges(github, context); if (branch) - await mergeChanges(branch, execa); + await mergebot.mergeChanges(branch, execa); diff --git a/.github/workflows/merge.js b/.github/workflows/merge.js index 7824c39..d191f54 100644 --- a/.github/workflows/merge.js +++ b/.github/workflows/merge.js @@ -93,7 +93,7 @@ async function checkChanges(github, context) { } const chosen = auto_prs[0]; const should_close = auto_prs.slice(1); - console.log(`Selected pull request: #${chosen.num}`); + console.log(`Selected pull request: #${chosen.number}`); await closePullRequests(should_close, github); return chosen.headRefName; }