diff options
| author | Zach Hilman <zachhilman@gmail.com> | 2019-09-30 15:29:28 +0200 |
|---|---|---|
| committer | Zach Hilman <zachhilman@gmail.com> | 2019-09-30 15:29:28 +0200 |
| commit | e6f3aad84e91c76568b766f9142fdae52f0f3242 (patch) | |
| tree | bbbf70fc66ea2b434082ee9df6528b26623d8701 /.ci/scripts/merge | |
| parent | Merge pull request #2923 from yuzu-emu/revert-2574-dynarmic-jit-nullptr (diff) | |
| download | yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar.gz yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar.bz2 yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar.lz yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar.xz yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.tar.zst yuzu-e6f3aad84e91c76568b766f9142fdae52f0f3242.zip | |
Diffstat (limited to '.ci/scripts/merge')
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label-private.py | 2 | ||||
| -rw-r--r-- | .ci/scripts/merge/apply-patches-by-label.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/merge/apply-patches-by-label-private.py b/.ci/scripts/merge/apply-patches-by-label-private.py index 11ec60010..6e3cb995e 100644 --- a/.ci/scripts/merge/apply-patches-by-label-private.py +++ b/.ci/scripts/merge/apply-patches-by-label-private.py @@ -5,7 +5,7 @@ import requests, sys, json, urllib3.request, shutil, subprocess, os, traceback org = os.getenv("PrivateMergeOrg".upper(), "yuzu-emu") repo = os.getenv("PrivateMergeRepo".upper(), "yuzu-private") -tagline = os.getenv("MergeTaglinePrivate".upper(), "") +tagline = sys.argv[3] user = sys.argv[1] http = urllib3.PoolManager() diff --git a/.ci/scripts/merge/apply-patches-by-label.py b/.ci/scripts/merge/apply-patches-by-label.py index 7f1ea06cf..e81db9287 100644 --- a/.ci/scripts/merge/apply-patches-by-label.py +++ b/.ci/scripts/merge/apply-patches-by-label.py @@ -3,7 +3,7 @@ import requests, sys, json, urllib3.request, shutil, subprocess, os -tagline = os.getenv("MergeTaglinePublic".upper(), "") +tagline = sys.argv[2] http = urllib3.PoolManager() dl_list = {} |