summaryrefslogtreecommitdiffstats
path: root/.ci/scripts
diff options
context:
space:
mode:
authorMorph <39850852+Morph1984@users.noreply.github.com>2021-11-17 04:26:54 +0100
committerMorph <39850852+Morph1984@users.noreply.github.com>2021-11-17 04:26:54 +0100
commit16aa49d13864661a2ba4568f36dfb21a05443afb (patch)
tree96340390384f0bf2ec69ca44b8b2127735b4c334 /.ci/scripts
parentMerge pull request #7219 from FernandoS27/aristotles-right-testicle (diff)
downloadyuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar.gz
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar.bz2
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar.lz
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar.xz
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.tar.zst
yuzu-16aa49d13864661a2ba4568f36dfb21a05443afb.zip
Diffstat (limited to '.ci/scripts')
-rw-r--r--.ci/scripts/merge/apply-patches-by-label-private.py2
-rw-r--r--.ci/scripts/merge/apply-patches-by-label.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label-private.py b/.ci/scripts/merge/apply-patches-by-label-private.py
index fe0acd510..16b45043e 100644
--- a/.ci/scripts/merge/apply-patches-by-label-private.py
+++ b/.ci/scripts/merge/apply-patches-by-label-private.py
@@ -25,7 +25,7 @@ def check_individual(repo_id, pr_id):
def merge_pr(pn, ref):
print("Matched PR# %s" % pn)
- print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f"]))
+ print(subprocess.check_output(["git", "fetch", "https://%sdev.azure.com/%s/_git/%s" % (user, org, repo), ref, "-f", "--no-recurse-submodules"]))
print(subprocess.check_output(["git", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')]))
print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)]))
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):
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)]))