DuckDuckWhale/org.yuzu_emu.yuzu
1
0
Fork 0
mirror of https://github.com/flathub/org.yuzu_emu.yuzu.git synced 2024-12-16 14:37:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: check if version bump has already happened

Browse Source
This commit is contained in:
liushuyu 2022-10-13 19:25:00 -06:00
parent 429d539cdf
commit 4813e01299
No known key found for this signature in database
GPG Key ID: 23D1CE4534419437
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,12 +45,7 @@ async function incrementVersion() {
}
async function mergeChanges(branch, execa) {
try {
const p = execa("git", ["merge", "--ff-only", `origin/${branch}`]);
p.stdout.pipe(process.stdout);
await p;
// bump the version number
await incrementVersion();
async function amendCommit() {
await execa("git", ["config", "--global", "user.name", "yuzubot"]);
await execa("git", [
"config",
@ -63,6 +58,27 @@ async function mergeChanges(branch, execa) {
const p1 = execa("git", ["commit", "--amend", "-C", "HEAD"]);
p1.stdout.pipe(process.stdout);
await p1;
}
async function hasChanges() {
const p = await execa("git", [
"status",
"--porcelain",
"org.yuzu_emu.yuzu.json",
]);
if (p.stdout.length > 2) {
return true;
}
return false;
}
try {
const p = execa("git", ["merge", "--ff-only", `origin/${branch}`]);
p.stdout.pipe(process.stdout);
await p;
// bump the version number
await incrementVersion();
if (hasChanges()) await amendCommit();
} catch (err) {
console.log(
`::error title=Merge failed::Failed to merge pull request: ${err}`