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 | |
| 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')
| -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 | ||||
| -rw-r--r-- | .ci/templates/mergebot-private.yml | 15 |
3 files changed, 13 insertions, 6 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 = {} diff --git a/.ci/templates/mergebot-private.yml b/.ci/templates/mergebot-private.yml index a673c5b01..0ba6d5434 100644 --- a/.ci/templates/mergebot-private.yml +++ b/.ci/templates/mergebot-private.yml @@ -8,16 +8,23 @@ steps: - script: chmod a+x $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh && $(System.DefaultWorkingDirectory)/.ci/scripts/merge/yuzubot-git-config.sh displayName: 'Apply Git Configuration' - task: PythonScript@0 - displayName: 'Discover, Download, and Apply Patches' + displayName: 'Discover, Download, and Apply Patches (Mainline)' inputs: scriptSource: 'filePath' scriptPath: '.ci/scripts/merge/apply-patches-by-label.py' - arguments: '${{ parameters.matchLabelPublic }} patches-public' + arguments: '${{ parameters.matchLabelPublic }} $(MergeTaglinePublic) patches-public' workingDirectory: '$(System.DefaultWorkingDirectory)' - task: PythonScript@0 - displayName: 'Discover, Download, and Apply Patches' + displayName: 'Discover, Download, and Apply Patches (Patreon Public)' + inputs: + scriptSource: 'filePath' + scriptPath: '.ci/scripts/merge/apply-patches-by-label.py' + arguments: '${{ parameters.matchLabel }} $(MergeTaglinePrivate)\ Public patches-mixed-public' + workingDirectory: '$(System.DefaultWorkingDirectory)' + - task: PythonScript@0 + displayName: 'Discover, Download, and Apply Patches (Patreon Private)' inputs: scriptSource: 'filePath' scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py' - arguments: '$(PrivateMergeUser) ${{ parameters.matchLabel }} patches-private' + arguments: '$(PrivateMergeUser) ${{ parameters.matchLabel }} $(MergeTaglinePrivate)\ Private patches-private' workingDirectory: '$(System.DefaultWorkingDirectory)' |