Browse Source

Merge pull request #2770 from DarkLordZach/azure-pr-fix

ci: Fix Azure PR Builds
nce_cpp
Flame Sage 6 years ago
committed by GitHub
parent
commit
9ec5e0a238
  1. 4
      .ci/templates/build-single.yml
  2. 1
      .ci/templates/build-standard.yml
  3. 3
      .ci/templates/build-testing.yml
  4. 2
      .ci/yuzu-mainline.yml
  5. 2
      .ci/yuzu-verify.yml

4
.ci/templates/build-single.yml

@ -1,12 +1,14 @@
parameters: parameters:
artifactSource: 'true' artifactSource: 'true'
cache: 'false'
steps: steps:
- task: DockerInstaller@0 - task: DockerInstaller@0
displayName: 'Prepare Environment' displayName: 'Prepare Environment'
inputs: inputs:
dockerVersion: '17.09.0-ce' dockerVersion: '17.09.0-ce'
- task: CacheBeta@0
- ${{ if eq(parameters.cache, 'true') }}:
- task: CacheBeta@0
displayName: 'Cache Build System' displayName: 'Cache Build System'
inputs: inputs:
key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix) key: yuzu-v1-$(BuildName)-$(BuildSuffix)-$(CacheSuffix)

1
.ci/templates/build-standard.yml

@ -20,3 +20,4 @@ jobs:
- template: ./build-single.yml - template: ./build-single.yml
parameters: parameters:
artifactSource: 'false' artifactSource: 'false'
cache: $(parameters.cache)

3
.ci/templates/build-testing.yml

@ -10,7 +10,7 @@ jobs:
BuildSuffix: 'windows-testing' BuildSuffix: 'windows-testing'
ScriptFolder: 'windows' ScriptFolder: 'windows'
steps: steps:
- script: pip install requests urllib3
- script: sudo apt upgrade python3-pip && pip install requests urllib3
displayName: 'Prepare Environment' displayName: 'Prepare Environment'
- task: PythonScript@0 - task: PythonScript@0
condition: eq(variables['Build.Reason'], 'PullRequest') condition: eq(variables['Build.Reason'], 'PullRequest')
@ -30,3 +30,4 @@ jobs:
- template: ./build-single.yml - template: ./build-single.yml
parameters: parameters:
artifactSource: 'false' artifactSource: 'false'
cache: 'false'

2
.ci/yuzu-mainline.yml

@ -21,3 +21,5 @@ stages:
dependsOn: format dependsOn: format
jobs: jobs:
- template: ./templates/build-standard.yml - template: ./templates/build-standard.yml
parameters:
cache: 'true'

2
.ci/yuzu-verify.yml

@ -15,4 +15,6 @@ stages:
dependsOn: format dependsOn: format
jobs: jobs:
- template: ./templates/build-standard.yml - template: ./templates/build-standard.yml
parameters:
cache: 'false'
- template: ./templates/build-testing.yml - template: ./templates/build-testing.yml
Loading…
Cancel
Save