From d9393c4ce443ffcd41c1f1cecb4c9dc90e3bce28 Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Wed, 12 Oct 2022 15:44:41 -0600
Subject: [PATCH] CI: bump actions/github-script to v6

---
 .github/workflows/auto-merge.yml | 2 +-
 .github/workflows/merge.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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", [