Просмотр исходного кода

ci: Populate patreon PRs on public repository

Zach Hilman 6 лет назад
Родитель
Сommit
e6f3aad84e

+ 1 - 1
.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()

+ 1 - 1
.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 = {}

+ 11 - 4
.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)'