DuckDuckWhale/org.yuzu_emu.yuzu
1
0
Fork 0
mirror of https://github.com/flathub/org.yuzu_emu.yuzu.git synced 2025-05-01 23:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: fix a mistake with the variable naming in the script

Browse Source
This commit is contained in:
liushuyu 2022-10-12 18:01:06 -06:00
parent c7265552a7
commit 3f017fd94c
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.github/workflows/merge.js vendored
View File

@ -46,19 +46,19 @@ async function incrementVersion() {
async function mergeChanges(branch, execa) { async function mergeChanges(branch, execa) {
try { try {
const process = await execa("git", [ const p = await execa("git", [
"merge", "merge",
"--ff-only", "--ff-only",
`origin/${branch}`, `origin/${branch}`,
]); ]);
process.stdout.pipe(process.stdout); p.stdout.pipe(process.stdout);
await incrementVersion(); await incrementVersion();
await execa("git", [ await execa("git", [
"add", "add",
"org.yuzu_emu.yuzu.json", "org.yuzu_emu.yuzu.json",
]); ]);
const process1 = await execa("git", ["commit", "--amend"]); const p1 = await execa("git", ["commit", "--amend"]);
process1.stdout.pipe(process1.stdout); p1.stdout.pipe(process.stdout);
} catch (err) { } catch (err) {
console.log( console.log(
`::error title=Merge failed::Failed to merge pull request: ${err}`, `::error title=Merge failed::Failed to merge pull request: ${err}`,
@ -66,16 +66,16 @@ async function mergeChanges(branch, execa) {
return; return;
} }
const process = await execa("git", [ const p = await execa("git", [
"push", "push",
"origin", "origin",
`master:${branch}`, `master:${branch}`,
"-f", "-f",
]); ]);
process.stdout.pipe(process.stdout); p.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"]); const p1 = await execa("git", ["push", "origin"]);
process1.stdout.pipe(process1.stdout); p1.stdout.pipe(process.stdout);
} }
async function checkChanges(github, context) { async function checkChanges(github, context) {