mirror of
https://github.com/flathub/org.yuzu_emu.yuzu.git
synced 2024-12-16 06:27:07 +00:00
CI: fix an issue where the async function is not await'ed
This commit is contained in:
parent
6b96916d3c
commit
6b3a543abc
4
.github/workflows/merge.js
vendored
4
.github/workflows/merge.js
vendored
@ -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}`
|
||||
|
Loading…
Reference in New Issue
Block a user