diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 04e807e..3e772b0 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -23,6 +23,6 @@ jobs: script: | const execa = require("execa"); const mergebot = require('./.github/workflows/merge.js'); - const branch = await mergebot.checkChanges(github); + const branch = await mergebot.checkChanges(github, context); if (branch) await mergeChanges(branch, execa); diff --git a/.github/workflows/merge.js b/.github/workflows/merge.js index 9e671b1..7824c39 100644 --- a/.github/workflows/merge.js +++ b/.github/workflows/merge.js @@ -56,7 +56,7 @@ async function mergeChanges(branch, execa) { await incrementVersion(); await execa("git", [ "add", - "org.yuzu_emu.yuzu.json" + "org.yuzu_emu.yuzu.json", ]); const process1 = await execa("git", ["commit", "--amend"]); process1.stdout.pipe(process.stdout); @@ -66,9 +66,14 @@ async function mergeChanges(branch, execa) { ); } - const process = await execa("git", ["push", "origin", `master:${branch}`, "-f"]); + const process = await execa("git", [ + "push", + "origin", + `master:${branch}`, + "-f", + ]); process.stdout.pipe(process.stdout); - await new Promise(r => setTimeout(r, 2000)); + await new Promise((r) => setTimeout(r, 2000)); const process1 = await execa("git", ["push", "origin"]); process1.stdout.pipe(process1.stdout); } diff --git a/shared-modules b/shared-modules index 1bb5393..a9112b9 160000 --- a/shared-modules +++ b/shared-modules @@ -1 +1 @@ -Subproject commit 1bb53934f105743f84f923693847185dce613cef +Subproject commit a9112b9c62e2b84db4c2f6c55c9531fd7e8d03c1