Browse Source
Merge pull request #7348 from Morph1984/ci-disable-submodule-fetch
ci: Don't fetch submodules when fetching PRs
pull/15/merge
Ameer J
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
.ci/scripts/merge/apply-patches-by-label-private.py
-
.ci/scripts/merge/apply-patches-by-label.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)])) |
|
|
|
|
|
|
|
|
|
|
|
@ -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)])) |
|
|
|
|
|
|
|
|
