summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Zach Hilman2019-07-28 14:21:18 -0400
committerGravatar Zach Hilman2019-07-28 14:21:18 -0400
commitbcbec6f37c7660780e5862cda20634bf4f4db139 (patch)
tree6a1824569d769eee1a46d63ba6921c263ecb1e0a
parentMerge pull request #2592 from FernandoS27/sync1 (diff)
downloadyuzu-bcbec6f37c7660780e5862cda20634bf4f4db139.tar.gz
yuzu-bcbec6f37c7660780e5862cda20634bf4f4db139.tar.xz
yuzu-bcbec6f37c7660780e5862cda20634bf4f4db139.zip
ci: Fix Azure PR Builds
Diffstat
-rw-r--r--.ci/templates/build-single.yml14
-rw-r--r--.ci/templates/build-standard.yml3
-rw-r--r--.ci/templates/build-testing.yml1
-rw-r--r--.ci/yuzu-mainline.yml2
-rw-r--r--.ci/yuzu-verify.yml4
5 files changed, 16 insertions, 8 deletions
diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml
index c411e25d1..ec5d1e3c6 100644
--- a/.ci/templates/build-single.yml
+++ b/.ci/templates/build-single.yml
@@ -1,17 +1,19 @@
1parameters: 1parameters:
2 artifactSource: 'true' 2 artifactSource: 'true'
3 cache: 'false'
3 4
4steps: 5steps:
5- task: DockerInstaller@0 6- task: DockerInstaller@0
6 displayName: 'Prepare Environment' 7 displayName: 'Prepare Environment'
7 inputs: 8 inputs:
8 dockerVersion: '17.09.0-ce' 9 dockerVersion: '17.09.0-ce'
9- task: CacheBeta@0 10- ${{ if eq(parameterscache, 'true') }}:
10 displayName: 'Cache Build System' 11 - task: CacheBeta@0
11 inputs: 12 displayName: 'Cache Build System'
12 key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix) 13 inputs:
13 path: $(System.DefaultWorkingDirectory)/ccache 14 key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)
14 cacheHitVar: CACHE_RESTORED 15 path: $(System.DefaultWorkingDirectory)/ccache
16 cacheHitVar: CACHE_RESTORED
15- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh 17- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/exec.sh && ./.ci/scripts/$(ScriptFolder)/exec.sh
16 displayName: 'Build' 18 displayName: 'Build'
17- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh 19- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh
diff --git a/.ci/templates/build-standard.yml b/.ci/templates/build-standard.yml
index 6cd209dbf..aa180894e 100644
--- a/.ci/templates/build-standard.yml
+++ b/.ci/templates/build-standard.yml
@@ -19,4 +19,5 @@ jobs:
19 needSubmodules: 'true' 19 needSubmodules: 'true'
20 - template: ./build-single.yml 20 - template: ./build-single.yml
21 parameters: 21 parameters:
22 artifactSource: 'false' \ No newline at end of file 22 artifactSource: 'false'
23 cache: $(parameters.cache) \ No newline at end of file
diff --git a/.ci/templates/build-testing.yml b/.ci/templates/build-testing.yml
index cb7736205..f024a0058 100644
--- a/.ci/templates/build-testing.yml
+++ b/.ci/templates/build-testing.yml
@@ -30,3 +30,4 @@ jobs:
30 - template: ./build-single.yml 30 - template: ./build-single.yml
31 parameters: 31 parameters:
32 artifactSource: 'false' 32 artifactSource: 'false'
33 cache: 'false'
diff --git a/.ci/yuzu-mainline.yml b/.ci/yuzu-mainline.yml
index 164bcb165..2930a8564 100644
--- a/.ci/yuzu-mainline.yml
+++ b/.ci/yuzu-mainline.yml
@@ -21,3 +21,5 @@ stages:
21 dependsOn: format 21 dependsOn: format
22 jobs: 22 jobs:
23 - template: ./templates/build-standard.yml 23 - template: ./templates/build-standard.yml
24 parameters:
25 cache: 'true'
diff --git a/.ci/yuzu-verify.yml b/.ci/yuzu-verify.yml
index d01c1feed..5492e696a 100644
--- a/.ci/yuzu-verify.yml
+++ b/.ci/yuzu-verify.yml
@@ -15,4 +15,6 @@ stages:
15 dependsOn: format 15 dependsOn: format
16 jobs: 16 jobs:
17 - template: ./templates/build-standard.yml 17 - template: ./templates/build-standard.yml
18 - template: ./templates/build-testing.yml \ No newline at end of file 18 parameters:
19 cache: 'false'
20 - template: ./templates/build-testing.yml
HIC SVNT DRACONES