diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index c411e25d1d33f18a92c0e173b03144086398ac3d..357731eb9c7e964a909a27f860835b5935551bb1 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(parameters.cache, '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 6cd209dbf7c99532751251018bd7b2ff84f98723..aa180894e71a24e2a01423639a8a8700a04fb50d 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 cb773620501a2339b79a9df4055b1af2a8f29660..a307addfd41fcb35014e8cef1744b829fec83e2c 100644 --- a/.ci/templates/build-testing.yml +++ b/.ci/templates/build-testing.yml @@ -10,7 +10,7 @@ jobs: BuildSuffix: 'windows-testing' ScriptFolder: 'windows' steps: - - script: pip install requests urllib3 + - script: sudo apt upgrade python3-pip && pip install requests urllib3 displayName: 'Prepare Environment' - task: PythonScript@0 condition: eq(variables['Build.Reason'], 'PullRequest') @@ -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 164bcb165ba1fe330fda00ca2d3136abc2836cd0..2930a85647fc1e55ecd805f1f26cd0765c4d44e9 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 d01c1feed060fa9fe5d6995ac5869dbfd0e15701..5492e696add1fed7d193ebcfb6f742148a1c5751 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