From bcbec6f37c7660780e5862cda20634bf4f4db139 Mon Sep 17 00:00:00 2001 From: Zach Hilman Date: Sun, 28 Jul 2019 14:21:18 -0400 Subject: [PATCH] ci: Fix Azure PR Builds --- .ci/templates/build-single.yml | 14 ++++++++------ .ci/templates/build-standard.yml | 3 ++- .ci/templates/build-testing.yml | 1 + .ci/yuzu-mainline.yml | 2 ++ .ci/yuzu-verify.yml | 4 +++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index c411e25d1d..ec5d1e3c6d 100644 --- a/.ci/templates/build-single.yml +++ b/.ci/templates/build-single.yml @@ -1,17 +1,19 @@ parameters: artifactSource: 'true' + cache: 'false' steps: - task: DockerInstaller@0 displayName: 'Prepare Environment' inputs: dockerVersion: '17.09.0-ce' -- task: CacheBeta@0 - displayName: 'Cache Build System' - inputs: - key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix) - path: $(System.DefaultWorkingDirectory)/ccache - cacheHitVar: CACHE_RESTORED +- ${{ if eq(parameterscache, 'true') }}: + - task: CacheBeta@0 + displayName: 'Cache Build System' + inputs: + key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix) + path: $(System.DefaultWorkingDirectory)/ccache + 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 && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh diff --git a/.ci/templates/build-standard.yml b/.ci/templates/build-standard.yml index 6cd209dbf7..aa180894e7 100644 --- a/.ci/templates/build-standard.yml +++ b/.ci/templates/build-standard.yml @@ -19,4 +19,5 @@ jobs: needSubmodules: 'true' - template: ./build-single.yml parameters: - artifactSource: 'false' \ No newline at end of file + artifactSource: 'false' + cache: $(parameters.cache) \ No newline at end of file diff --git a/.ci/templates/build-testing.yml b/.ci/templates/build-testing.yml index cb77362050..f024a0058a 100644 --- a/.ci/templates/build-testing.yml +++ b/.ci/templates/build-testing.yml @@ -30,3 +30,4 @@ jobs: - template: ./build-single.yml parameters: artifactSource: 'false' + cache: 'false' diff --git a/.ci/yuzu-mainline.yml b/.ci/yuzu-mainline.yml index 164bcb165b..2930a85647 100644 --- a/.ci/yuzu-mainline.yml +++ b/.ci/yuzu-mainline.yml @@ -21,3 +21,5 @@ stages: dependsOn: format jobs: - template: ./templates/build-standard.yml + parameters: + cache: 'true' diff --git a/.ci/yuzu-verify.yml b/.ci/yuzu-verify.yml index d01c1feed0..5492e696ad 100644 --- a/.ci/yuzu-verify.yml +++ b/.ci/yuzu-verify.yml @@ -15,4 +15,6 @@ stages: dependsOn: format jobs: - template: ./templates/build-standard.yml - - template: ./templates/build-testing.yml \ No newline at end of file + parameters: + cache: 'false' + - template: ./templates/build-testing.yml