jcgruenhage/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2024-11-14 10:14:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7348 from Morph1984/ci-disable-submodule-fetch

Browse source 
ci: Don't fetch submodules when fetching PRs
This commit is contained in:
Ameer J 2021-11-17 23:58:34 -05:00 committed by GitHub
commit 66fed9ecbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.ci/scripts/merge/apply-patches-by-label-private.py
View file

@ -25,7 +25,7 @@ def check_individual(repo_id, pr_id):
def merge_pr(pn, ref): def merge_pr(pn, ref):
print("Matched PR# %s" % pn) 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", "merge", "--squash", 'origin/' + ref.replace('refs/heads/','')]))
print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)]))

2
.ci/scripts/merge/apply-patches-by-label.py
View file

@ -25,7 +25,7 @@ def do_page(page):
if (check_individual(pr["labels"])): if (check_individual(pr["labels"])):
pn = pr["number"] pn = pr["number"]
print("Matched PR# %s" % pn) 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", "merge", "--squash", "pr-%s" % pn]))
print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)]))