diff options
Diffstat (limited to '')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index 43ed74d7f..c288a70a1 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -1,7 +1,7 @@ # Download all pull requests as patches that match a specific label # Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to> -import requests, sys, json, urllib3.request, shutil, subprocess, os +import requests, sys, json, urllib3.request, shutil, subprocess, os, traceback tagline = sys.argv[2] @@ -25,7 +25,7 @@ def do_page(page): 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"])) + 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)])) @@ -33,4 +33,5 @@ try: for i in range(1,30): do_page(i) except: + traceback.print_exc(file=sys.stdout) sys.exit(-1) |