From 6b3a543abc1a305c13542145bec35b04b926b643 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Fri, 14 Oct 2022 23:56:03 -0600 Subject: [PATCH] CI: fix an issue where the async function is not await'ed --- .github/workflows/merge.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge.js b/.github/workflows/merge.js index 8b4a9e1..a942591 100644 --- a/.github/workflows/merge.js +++ b/.github/workflows/merge.js @@ -67,7 +67,7 @@ async function mergeChanges(branch, execa) { "org.yuzu_emu.yuzu.json", ]); if (p.stdout.length > 20) { - console.info("Skip version bump."); + console.info("Version was bumped by this script."); return true; } return false; @@ -79,7 +79,7 @@ async function mergeChanges(branch, execa) { await p; // bump the version number await incrementVersion(); - if (hasChanges()) await amendCommit(); + if (await hasChanges()) await amendCommit(); } catch (err) { console.log( `::error title=Merge failed::Failed to merge pull request: ${err}`