mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
Merge pull request #7348 from Morph1984/ci-disable-submodule-fetch
ci: Don't fetch submodules when fetching PRs
This commit is contained in:
commit
66fed9ecbd
2 changed files with 2 additions and 2 deletions
|
@ -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)]))
|
||||||
|
|
||||||
|
|
|
@ -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)]))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue