diff options
| author |  ameerj | 2021-10-11 16:57:41 -0400 |
|---|---|---|
| committer | ameerj | 2021-10-11 16:57:41 -0400 |
| commit | 1ea303e2afb2eeeda7926e0bf68cc226ffb82924 (patch) | |
| tree | 3c631753b3a5aac763dc01618495cad11dec2e6f /.ci/templates | |
| parent | Merge pull request #7110 from vonchenplus/fix_extract_offline_romefs_error (diff) | |
| download | yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.gz yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.xz yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.zip | |
ci: Use ubuntu-latest vmImage where applicable
Not specifying the vmImage defaults to ubuntu-16.04, which will be deprecated soon and is experiencing brownouts.
Diffstat (limited to '.ci/templates')
| -rw-r--r-- | .ci/templates/merge-private.yml | 4 | ||||
| -rw-r--r-- | .ci/templates/merge.yml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/.ci/templates/merge-private.yml b/.ci/templates/merge-private.yml index f15a74355..c74561c46 100644 --- a/.ci/templates/merge-private.yml +++ b/.ci/templates/merge-private.yml | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | jobs: | 1 | jobs: |
| 2 | - job: merge | 2 | - job: merge |
| 3 | displayName: 'pull requests' | 3 | displayName: 'pull requests' |
| 4 | pool: | ||
| 5 | vmImage: 'ubuntu-latest' | ||
| 4 | steps: | 6 | steps: |
| 5 | - checkout: self | 7 | - checkout: self |
| 6 | submodules: recursive | 8 | submodules: recursive |
| @@ -24,6 +26,8 @@ jobs: | |||
| 24 | - job: upload_source | 26 | - job: upload_source |
| 25 | displayName: 'upload' | 27 | displayName: 'upload' |
| 26 | dependsOn: merge | 28 | dependsOn: merge |
| 29 | pool: | ||
| 30 | vmImage: 'ubuntu-latest' | ||
| 27 | steps: | 31 | steps: |
| 28 | - template: ./sync-source.yml | 32 | - template: ./sync-source.yml |
| 29 | parameters: | 33 | parameters: |
diff --git a/.ci/templates/merge.yml b/.ci/templates/merge.yml index 460dfa1c1..27c36e162 100644 --- a/.ci/templates/merge.yml +++ b/.ci/templates/merge.yml | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | jobs: | 1 | jobs: |
| 2 | - job: merge | 2 | - job: merge |
| 3 | displayName: 'pull requests' | 3 | displayName: 'pull requests' |
| 4 | pool: | ||
| 5 | vmImage: 'ubuntu-latest' | ||
| 4 | steps: | 6 | steps: |
| 5 | - checkout: self | 7 | - checkout: self |
| 6 | submodules: recursive | 8 | submodules: recursive |
| @@ -23,6 +25,8 @@ jobs: | |||
| 23 | - job: upload_source | 25 | - job: upload_source |
| 24 | displayName: 'upload' | 26 | displayName: 'upload' |
| 25 | dependsOn: merge | 27 | dependsOn: merge |
| 28 | pool: | ||
| 29 | vmImage: 'ubuntu-latest' | ||
| 26 | steps: | 30 | steps: |
| 27 | - template: ./sync-source.yml | 31 | - template: ./sync-source.yml |
| 28 | parameters: | 32 | parameters: |