summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <DarkLordZach@users.noreply.github.com>2019-07-24 22:42:33 +0200
committerFlame Sage <chris062689@gmail.com>2019-07-24 22:42:33 +0200
commit12514ccd3593f0bf395f6a86030b9f7b00b8eb85 (patch)
treeb6d7232138bdba7577dcd352dd48e2e1a8d36f75
parentMerge pull request #2734 from ReinUsesLisp/compute-shaders (diff)
downloadyuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.gz
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.bz2
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.lz
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.xz
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.tar.zst
yuzu-12514ccd3593f0bf395f6a86030b9f7b00b8eb85.zip
-rw-r--r--.ci/templates/build-single.yml2
-rw-r--r--.ci/templates/build-testing.yml8
-rw-r--r--README.md2
3 files changed, 7 insertions, 5 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:
cacheHitVar: CACHE_RESTORED
- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh
displayName: 'Build'
-- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && ./.ci/scripts/$(ScriptFolder)/upload.sh
+- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
displayName: 'Package Artifacts'
- publish: artifacts
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:
pool:
vmImage: ubuntu-latest
strategy:
- maxParallel: 10
+ maxParallel: 5
matrix:
windows:
BuildSuffix: 'windows-testing'
ScriptFolder: 'windows'
steps:
+ - script: pip install requests urllib3
+ displayName: 'Prepare Environment'
- task: PythonScript@0
condition: eq(variables['Build.Reason'], 'PullRequest')
displayName: 'Determine Testing Status'
inputs:
scriptSource: 'filePath'
- scriptPath: '../scripts/merge/check-label-presence.py'
+ scriptPath: '.ci/scripts/merge/check-label-presence.py'
arguments: '$(System.PullRequest.PullRequestNumber) create-testing-build'
- ${{ if eq(variables.enabletesting, 'true') }}:
- template: ./sync-source.yml
@@ -27,4 +29,4 @@ jobs:
matchLabel: 'testing-merge'
- template: ./build-single.yml
parameters:
- artifactSource: 'false' \ No newline at end of file
+ artifactSource: 'false'
diff --git a/README.md b/README.md
index 32b889063..430c6dd65 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-yuzu emulator
+yuzu emulator
=============
[![Travis CI Build Status](https://travis-ci.org/yuzu-emu/yuzu.svg?branch=master)](https://travis-ci.org/yuzu-emu/yuzu)
[![AppVeyor CI Build Status](https://ci.appveyor.com/api/projects/status/77k97svb2usreu68?svg=true)](https://ci.appveyor.com/project/bunnei/yuzu)