diff options
| author | bunnei <bunneidev@gmail.com> | 2019-10-01 16:56:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 16:56:50 +0200 |
| commit | 80d6abc08b742aeff719b838f46085ad6e716fca (patch) | |
| tree | 2f6c5cb12b610610662c349d9448f9c7796850c5 /.ci/templates | |
| parent | Merge pull request #2923 from yuzu-emu/revert-2574-dynarmic-jit-nullptr (diff) | |
| parent | ci: Correct arguments for mergebot script (diff) | |
| download | yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar.gz yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar.bz2 yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar.lz yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar.xz yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.tar.zst yuzu-80d6abc08b742aeff719b838f46085ad6e716fca.zip | |
Diffstat (limited to '.ci/templates')
| -rw-r--r-- | .ci/templates/mergebot-private.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.ci/templates/mergebot-private.yml b/.ci/templates/mergebot-private.yml index a673c5b01..f9a40cf61 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)' |