diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index b04936d..a16d0d9 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -16,7 +16,7 @@ jobs: fetch-depth: 0 submodules: true - run: npm install execa@5 - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 name: Check and Merge id: check-changes with: diff --git a/.github/workflows/merge.js b/.github/workflows/merge.js index d191f54..1ba752d 100644 --- a/.github/workflows/merge.js +++ b/.github/workflows/merge.js @@ -45,7 +45,6 @@ async function incrementVersion() { } async function mergeChanges(branch, execa) { - let mergeResults = {}; try { const process = await execa("git", [ "merge", @@ -64,6 +63,7 @@ async function mergeChanges(branch, execa) { console.log( `::error title=Merge failed::Failed to merge pull request: ${err}`, ); + return; } const process = await execa("git", [