Merge pull request #2770 from DarkLordZach/azure-pr-fix
ci: Fix Azure PR Builds
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -19,4 +19,5 @@ jobs:
 | 
			
		||||
      needSubmodules: 'true'
 | 
			
		||||
  - template: ./build-single.yml
 | 
			
		||||
    parameters:
 | 
			
		||||
      artifactSource: 'false'
 | 
			
		||||
      artifactSource: 'false'
 | 
			
		||||
      cache: $(parameters.cache)
 | 
			
		||||
@@ -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'
 | 
			
		||||
 
 | 
			
		||||
@@ -21,3 +21,5 @@ stages:
 | 
			
		||||
  dependsOn: format
 | 
			
		||||
  jobs:
 | 
			
		||||
  - template: ./templates/build-standard.yml
 | 
			
		||||
    parameters:
 | 
			
		||||
      cache: 'true'
 | 
			
		||||
 
 | 
			
		||||
@@ -15,4 +15,6 @@ stages:
 | 
			
		||||
  dependsOn: format
 | 
			
		||||
  jobs:
 | 
			
		||||
  - template: ./templates/build-standard.yml
 | 
			
		||||
  - template: ./templates/build-testing.yml
 | 
			
		||||
    parameters:
 | 
			
		||||
      cache: 'false'
 | 
			
		||||
  - template: ./templates/build-testing.yml
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user