diff options
Diffstat (limited to '.ci/scripts/merge/apply-patches-by-label.py')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index b2e430ac7..c288a70a1 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py | |||
| @@ -25,7 +25,7 @@ def do_page(page): | |||
| 25 | if (check_individual(pr["labels"])): | 25 | if (check_individual(pr["labels"])): |
| 26 | pn = pr["number"] | 26 | pn = pr["number"] |
| 27 | print("Matched PR# %s" % pn) | 27 | print("Matched PR# %s" % pn) |
| 28 | print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f"])) | 28 | print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f", "--no-recurse-submodules"])) |
| 29 | print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) | 29 | print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) |
| 30 | print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) | 30 | print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) |
| 31 | 31 | ||