diff options
| author | 2019-09-26 09:29:15 -0400 | |
|---|---|---|
| committer | 2019-09-26 09:29:15 -0400 | |
| commit | 3f52bb5677e2787a343a017d81979c7d5ef98172 (patch) | |
| tree | 94a77fd28797fe4d178a48e256f497e37971ca94 | |
| parent | ci: Add private mergebot script (diff) | |
| download | yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.gz yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.xz yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.zip | |
ci: Optionally prepend commit messages with environment variable
Diffstat (limited to '')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index b346001a5..7f1ea06cf 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py | |||
| @@ -1,7 +1,9 @@ | |||
| 1 | # Download all pull requests as patches that match a specific label | 1 | # Download all pull requests as patches that match a specific label |
| 2 | # Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to> | 2 | # Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to> |
| 3 | 3 | ||
| 4 | import requests, sys, json, urllib3.request, shutil, subprocess | 4 | import requests, sys, json, urllib3.request, shutil, subprocess, os |
| 5 | |||
| 6 | tagline = os.getenv("MergeTaglinePublic".upper(), "") | ||
| 5 | 7 | ||
| 6 | http = urllib3.PoolManager() | 8 | http = urllib3.PoolManager() |
| 7 | dl_list = {} | 9 | dl_list = {} |
| @@ -23,6 +25,6 @@ try: | |||
| 23 | print("Matched PR# %s" % pn) | 25 | print("Matched PR# %s" % pn) |
| 24 | print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f"])) | 26 | print(subprocess.check_output(["git", "fetch", "https://github.com/yuzu-emu/yuzu.git", "pull/%s/head:pr-%s" % (pn, pn), "-f"])) |
| 25 | print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) | 27 | print(subprocess.check_output(["git", "merge", "--squash", "pr-%s" % pn])) |
| 26 | print(subprocess.check_output(["git", "commit", "-m\"Merge PR %s\"" % pn])) | 28 | print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) |
| 27 | except: | 29 | except: |
| 28 | sys.exit(-1) | 30 | sys.exit(-1) |