summaryrefslogtreecommitdiff
path: root/.ci/templates
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-07-24 16:42:33 -0400
committerGravatar Flame Sage2019-07-24 16:42:33 -0400
commit12514ccd3593f0bf395f6a86030b9f7b00b8eb85 (patch)
treeb6d7232138bdba7577dcd352dd48e2e1a8d36f75 /.ci/templates
parentMerge pull request #2734 from ReinUsesLisp/compute-shaders (diff)
downloadyuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.gz
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.xz
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.zip
Fix README change mistake (#2754)
Fix README change mistake
Diffstat (limited to '.ci/templates')
-rw-r--r--.ci/templates/build-single.yml2
-rw-r--r--.ci/templates/build-testing.yml8
2 files changed, 6 insertions, 4 deletions
diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml
index 77eeb96b5..c411e25d1 100644
--- a/.ci/templates/build-single.yml
+++ b/.ci/templates/build-single.yml
@@ -14,7 +14,7 @@ steps:
14 cacheHitVar: CACHE_RESTORED 14 cacheHitVar: CACHE_RESTORED
15- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh 15- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh
16 displayName: 'Build' 16 displayName: 'Build'
17- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && ./.ci/scripts/$(ScriptFolder)/upload.sh 17- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
18 displayName: 'Package Artifacts' 18 displayName: 'Package Artifacts'
19- publish: artifacts 19- publish: artifacts
20 artifact: 'yuzu-$(BuildName)-$(BuildSuffix)' 20 artifact: 'yuzu-$(BuildName)-$(BuildSuffix)'
diff --git a/.ci/templates/build-testing.yml b/.ci/templates/build-testing.yml
index 278efb6f5..cb7736205 100644
--- a/.ci/templates/build-testing.yml
+++ b/.ci/templates/build-testing.yml
@@ -4,18 +4,20 @@ jobs:
4 pool: 4 pool:
5 vmImage: ubuntu-latest 5 vmImage: ubuntu-latest
6 strategy: 6 strategy:
7 maxParallel: 10 7 maxParallel: 5
8 matrix: 8 matrix:
9 windows: 9 windows:
10 BuildSuffix: 'windows-testing' 10 BuildSuffix: 'windows-testing'
11 ScriptFolder: 'windows' 11 ScriptFolder: 'windows'
12 steps: 12 steps:
13 - script: pip install requests urllib3
14 displayName: 'Prepare Environment'
13 - task: PythonScript@0 15 - task: PythonScript@0
14 condition: eq(variables['Build.Reason'], 'PullRequest') 16 condition: eq(variables['Build.Reason'], 'PullRequest')
15 displayName: 'Determine Testing Status' 17 displayName: 'Determine Testing Status'
16 inputs: 18 inputs:
17 scriptSource: 'filePath' 19 scriptSource: 'filePath'
18 scriptPath: '../scripts/merge/check-label-presence.py' 20 scriptPath: '.ci/scripts/merge/check-label-presence.py'
19 arguments: '$(System.PullRequest.PullRequestNumber) create-testing-build' 21 arguments: '$(System.PullRequest.PullRequestNumber) create-testing-build'
20 - ${{ if eq(variables.enabletesting, 'true') }}: 22 - ${{ if eq(variables.enabletesting, 'true') }}:
21 - template: ./sync-source.yml 23 - template: ./sync-source.yml
@@ -27,4 +29,4 @@ jobs:
27 matchLabel: 'testing-merge' 29 matchLabel: 'testing-merge'
28 - template: ./build-single.yml 30 - template: ./build-single.yml
29 parameters: 31 parameters:
30 artifactSource: 'false' \ No newline at end of file 32 artifactSource: 'false'