diff options
Diffstat (limited to '')
-rw-r--r-- | .ci/templates/build-single.yml | 16 | ||||
-rw-r--r-- | .ci/templates/build-standard.yml | 5 | ||||
-rw-r--r-- | .ci/templates/build-testing.yml | 11 | ||||
-rw-r--r-- | .ci/templates/release.yml | 29 | ||||
-rw-r--r-- | .ci/yuzu-mainline.yml | 2 | ||||
-rw-r--r-- | .ci/yuzu-verify.yml | 4 |
6 files changed, 24 insertions, 43 deletions
diff --git a/.ci/templates/build-single.yml b/.ci/templates/build-single.yml index 77eeb96b5..357731eb9 100644 --- a/.ci/templates/build-single.yml +++ b/.ci/templates/build-single.yml @@ -1,20 +1,22 @@ 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 && ./.ci/scripts/$(ScriptFolder)/upload.sh +- script: chmod a+x ./.ci/scripts/$(ScriptFolder)/upload.sh && RELEASE_NAME=$(BuildName) ./.ci/scripts/$(ScriptFolder)/upload.sh displayName: 'Package Artifacts' - publish: artifacts artifact: 'yuzu-$(BuildName)-$(BuildSuffix)' diff --git a/.ci/templates/build-standard.yml b/.ci/templates/build-standard.yml index 9975f5c49..aa180894e 100644 --- a/.ci/templates/build-standard.yml +++ b/.ci/templates/build-standard.yml @@ -3,7 +3,7 @@ jobs: displayName: 'standard' pool: vmImage: ubuntu-latest - strategy: + strategy: maxParallel: 10 matrix: windows: @@ -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 101e52996..a307addfd 100644 --- a/.ci/templates/build-testing.yml +++ b/.ci/templates/build-testing.yml @@ -3,19 +3,21 @@ jobs: displayName: 'testing' pool: vmImage: ubuntu-latest - strategy: - maxParallel: 10 + strategy: + maxParallel: 5 matrix: windows: BuildSuffix: 'windows-testing' ScriptFolder: 'windows' steps: + - script: sudo apt upgrade python3-pip && pip install requests urllib3 + displayName: 'Prepare Environment' - task: PythonScript@0 condition: eq(variables['Build.Reason'], 'PullRequest') displayName: 'Determine Testing Status' inputs: scriptSource: 'filePath' - scriptPath: '../scripts/merge/check-label-presence.py' + scriptPath: '.ci/scripts/merge/check-label-presence.py' arguments: '$(System.PullRequest.PullRequestNumber) create-testing-build' - ${{ if eq(variables.enabletesting, 'true') }}: - template: ./sync-source.yml @@ -27,4 +29,5 @@ jobs: matchLabel: 'testing-merge' - template: ./build-single.yml parameters: - artifactSource: 'false'
\ No newline at end of file + artifactSource: 'false' + cache: 'false' diff --git a/.ci/templates/release.yml b/.ci/templates/release.yml deleted file mode 100644 index 60bebd2aa..000000000 --- a/.ci/templates/release.yml +++ /dev/null @@ -1,29 +0,0 @@ -steps: - - task: DownloadPipelineArtifact@2 - displayName: 'Download Windows Release' - inputs: - artifactName: 'yuzu-$(BuildName)-windows-mingw' - buildType: 'current' - targetPath: '$(Build.ArtifactStagingDirectory)' - - task: DownloadPipelineArtifact@2 - displayName: 'Download Linux Release' - inputs: - artifactName: 'yuzu-$(BuildName)-linux' - buildType: 'current' - targetPath: '$(Build.ArtifactStagingDirectory)' - - task: DownloadPipelineArtifact@2 - displayName: 'Download Release Point' - inputs: - artifactName: 'yuzu-$(BuildName)-release-point' - buildType: 'current' - targetPath: '$(Build.ArtifactStagingDirectory)' - - script: echo '##vso[task.setvariable variable=tagcommit]' && cat $(Build.ArtifactStagingDirectory)/tag-commit.sha - displayName: 'Calculate Release Point' - - task: GitHubRelease@0 - inputs: - gitHubConnection: $(GitHubReleaseConnectionName) - repositoryName: '$(GitHubReleaseRepoName)' - action: 'create' - target: $(variables.tagcommit) - title: 'yuzu $(BuildName) #$(Build.BuildId)' - assets: '$(Build.ArtifactStagingDirectory)/*' 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 |