franklinblanco/yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2929 from DarkLordZach/azure-patreon-merge-extra

Browse Source 
ci: Merge patreon tagged PRs from public repository during merge step.
This commit is contained in:
bunnei 2019-10-01 10:56:50 -04:00 committed by GitHub
commit 80d6abc08b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/scripts/merge/apply-patches-by-label-private.py
View File

@ -5,7 +5,7 @@ import requests, sys, json, urllib3.request, shutil, subprocess, os, traceback
org = os.getenv("PrivateMergeOrg".upper(), "yuzu-emu") org = os.getenv("PrivateMergeOrg".upper(), "yuzu-emu")
repo = os.getenv("PrivateMergeRepo".upper(), "yuzu-private") repo = os.getenv("PrivateMergeRepo".upper(), "yuzu-private")
tagline = os.getenv("MergeTaglinePrivate".upper(), "") tagline = sys.argv[3]
user = sys.argv[1] user = sys.argv[1]
http = urllib3.PoolManager() http = urllib3.PoolManager()

2
.ci/scripts/merge/apply-patches-by-label.py
View File

@ -3,7 +3,7 @@
import requests, sys, json, urllib3.request, shutil, subprocess, os import requests, sys, json, urllib3.request, shutil, subprocess, os
tagline = os.getenv("MergeTaglinePublic".upper(), "") tagline = sys.argv[2]
http = urllib3.PoolManager() http = urllib3.PoolManager()
dl_list = {} dl_list = {}

15
.ci/templates/mergebot-private.yml
View File

@ -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 - 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' displayName: 'Apply Git Configuration'
- task: PythonScript@0 - task: PythonScript@0
displayName: 'Discover, Download, and Apply Patches' displayName: 'Discover, Download, and Apply Patches (Mainline)'
inputs: inputs:
scriptSource: 'filePath' scriptSource: 'filePath'
scriptPath: '.ci/scripts/merge/apply-patches-by-label.py' scriptPath: '.ci/scripts/merge/apply-patches-by-label.py'
arguments: '${{ parameters.matchLabelPublic }} patches-public' arguments: '${{ parameters.matchLabelPublic }} $(MergeTaglinePublic) patches-public'
workingDirectory: '$(System.DefaultWorkingDirectory)' workingDirectory: '$(System.DefaultWorkingDirectory)'
- task: PythonScript@0 - 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: inputs:
scriptSource: 'filePath' scriptSource: 'filePath'
scriptPath: '.ci/scripts/merge/apply-patches-by-label-private.py' 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)' workingDirectory: '$(System.DefaultWorkingDirectory)'