diff options
| author | bunnei <bunneidev@gmail.com> | 2019-10-01 10:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 10:56:50 -0400 |
| commit | 80d6abc08b742aeff719b838f46085ad6e716fca (patch) | |
| tree | 2f6c5cb12b610610662c349d9448f9c7796850c5 /.ci/scripts | |
| parent | e11afeb34d7b4493a94c18fd7960df97b7d95156 (diff) | |
| parent | 4ea425d6cf8b77a989203a8d9771b78da7c48c96 (diff) | |
Merge pull request #2929 from DarkLordZach/azure-patreon-merge-extra
ci: Merge patreon tagged PRs from public repository during merge step.
Diffstat (limited to '.ci/scripts')
| -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 = {} |