diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-01-30 01:29:21 +0100 |
|---|---|---|
| committer | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-01-30 01:53:14 +0100 |
| commit | 0f04cabf84a10ad461dd1db2e3535f3e987be29f (patch) | |
| tree | 45394e904eef47a837fdbb1069609291bd791fc6 /.ci/scripts/merge | |
| parent | ci: Abort on failure to query Github's API (diff) | |
| download | yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar.gz yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar.bz2 yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar.lz yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar.xz yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.tar.zst yuzu-0f04cabf84a10ad461dd1db2e3535f3e987be29f.zip | |
Diffstat (limited to '.ci/scripts/merge')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index 3c5952aa1..a31c0aac4 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -18,7 +18,7 @@ def check_individual(labels): return False def do_page(page): - url = 'https://api.github.com/repos/yuzu-emu/yuzu/pulls?page=%s' % page + url = f"https://api.github.com/repos/yuzu-emu/yuzu/pulls?page={page}" response = requests.get(url) response.raise_for_status() if (response.ok): @@ -28,10 +28,10 @@ def do_page(page): for pr in j: if (check_individual(pr["labels"])): pn = pr["number"] - print("Matched PR# %s" % pn) - print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f", "--no-recurse-submodules"])) - print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) - print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) + print(f"Matched PR# {pn}") + print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", f"pull/{pn}/head:pr-{pn}", "-f", "--no-recurse-submodules"])) + print(subprocess.check_output(["git", "merge", "--squash", f"pr-{pn}"])) + print(subprocess.check_output(["git", "commit", f"-m\"Merge {tagline} PR {pn}\""])) try: for i in range(1,10): |