diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2019-09-26 15:29:15 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2019-09-26 15:29:15 +0200 |
| commit | 3f52bb5677e2787a343a017d81979c7d5ef98172 (patch) | |
| tree | 94a77fd28797fe4d178a48e256f497e37971ca94 | |
| parent | ci: Add private mergebot script (diff) | |
| download | yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.gz yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.bz2 yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.lz yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.xz yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.tar.zst yuzu-3f52bb5677e2787a343a017d81979c7d5ef98172.zip | |
| -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 @@ # Download all pull requests as patches that match a specific label # Usage: python download-patches-by-label.py <Label to Match> <Root Path Folder to DL to> -import requests, sys, json, urllib3.request, shutil, subprocess +import requests, sys, json, urllib3.request, shutil, subprocess, os + +tagline = os.getenv("MergeTaglinePublic".upper(), "") http = urllib3.PoolManager() dl_list = {} @@ -23,6 +25,6 @@ try: 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", "merge", "--squash", "pr-%s" % pn])) - print(subprocess.check_output(["git", "commit", "-m\"Merge PR %s\"" % pn])) + print(subprocess.check_output(["git", "commit", "-m\"Merge %s PR %s\"" % (tagline, pn)])) except: sys.exit(-1) |