summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmeer J <52414509+ameerj@users.noreply.github.com>2021-11-18 05:58:34 +0100
committerGitHub <noreply@github.com>2021-11-18 05:58:34 +0100
commit66fed9ecbdf2124295e0648487f0ed509590c0d5 (patch)
tree8ff2ea1c41c4f7dd99939ca04834d089ace10fe7
parentMerge pull request #7355 from german77/hotkey_spam (diff)
parentci: Don't fetch submodules when fetching PRs (diff)
downloadyuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar.gz
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar.bz2
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar.lz
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar.xz
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.tar.zst
yuzu-66fed9ecbdf2124295e0648487f0ed509590c0d5.zip
-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)]))