diff options
| author | Flame Sage <chris062689@gmail.com> | 2019-08-02 04:04:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 04:04:21 +0200 |
| commit | 978f7067eeb8553e2adccf128d28658881246d27 (patch) | |
| tree | 9632549e5d0e586c07e3e1b142c426c1a17cd25d | |
| parent | Merge pull request #2592 from FernandoS27/sync1 (diff) | |
| parent | Correct apt permissions (diff) | |
| download | yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar.gz yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar.bz2 yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar.lz yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar.xz yuzu-978f7067eeb8553e2adccf128d28658881246d27.tar.zst yuzu-978f7067eeb8553e2adccf128d28658881246d27.zip | |
| -rw-r--r-- | .ci/templates/build-single.yml | 14 | ||||
| -rw-r--r-- | .ci/templates/build-standard.yml | 3 | ||||
| -rw-r--r-- | .ci/templates/build-testing.yml | 3 | ||||
| -rw-r--r-- | .ci/yuzu-mainline.yml | 2 | ||||
| -rw-r--r-- | .ci/yuzu-verify.yml | 4 |
5 files changed, 17 insertions, 9 deletions
diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index c411e25d1..357731eb9 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 6cd209dbf..aa180894e 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 cb7736205..a307addfd 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 164bcb165..2930a8564 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 d01c1feed..5492e696a 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 |