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

CI: fix an issue with the process wait

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

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

@ -15,7 +15,7 @@ const check_query = `query($name: String!){
}`;
const close_pr_mutation = `mutation cpm_{num} {
closePullRequest(input: {pullRequestId: "{id}"})
closePullRequest(input: {pullRequestId: "{id}"}) { clientMutationId }
}`;
async function closePullRequests(should_close, github) {
@ -46,19 +46,23 @@ async function incrementVersion() {
async function mergeChanges(branch, execa) {
try {
const p = await execa("git", [
const p = execa("git", [
"merge",
"--ff-only",
`origin/${branch}`,
]);
p.stdout.pipe(process.stdout);
await p;
// bump the version number
await incrementVersion();
await execa("git", [
"add",
"org.yuzu_emu.yuzu.json",
]);
const p1 = await execa("git", ["commit", "--amend"]);
// amend the commit to include the version change
const p1 = execa("git", ["commit", "--amend"]);
p1.stdout.pipe(process.stdout);
await p1;
} catch (err) {
console.log(
`::error title=Merge failed::Failed to merge pull request: ${err}`,
@ -66,16 +70,19 @@ async function mergeChanges(branch, execa) {
return;
}
const p = await execa("git", [
const p = execa("git", [
"push",
"origin",
`master:${branch}`,
"-f",
]);
p.stdout.pipe(process.stdout);
await p;
await new Promise((r) => setTimeout(r, 2000));
const p1 = await execa("git", ["push", "origin"]);
// wait a while for GitHub to process the pull request update
const p1 = execa("git", ["push", "origin"]);
p1.stdout.pipe(process.stdout);
await p1;
}
async function checkChanges(github, context) {