Merge pull request #7164 from ameerj/vmimage

ci: Use ubuntu-latest vmImage where applicable
2021-10-11 17:06:28 +07:00 · 2021-10-11 17:06:28 +07:00 · c709fbba23
parent 97452b9558 1ea303e2af
commit c709fbba23
4 changed files with 12 additions and 0 deletions
--- a/.ci/templates/merge-private.yml
+++ b/.ci/templates/merge-private.yml
@ -1,6 +1,8 @@
 jobs:
 - job: merge
  displayName: 'pull requests'
+  pool:
+    vmImage: 'ubuntu-latest'
  steps:
  - checkout: self
    submodules: recursive
@ -24,6 +26,8 @@ jobs:
 - job: upload_source
  displayName: 'upload'
  dependsOn: merge
+  pool:
+    vmImage: 'ubuntu-latest'
  steps:
  - template: ./sync-source.yml
    parameters:
--- a/.ci/templates/merge.yml
+++ b/.ci/templates/merge.yml
@ -1,6 +1,8 @@
 jobs:
 - job: merge
  displayName: 'pull requests'
+  pool:
+    vmImage: 'ubuntu-latest'
  steps:
  - checkout: self
    submodules: recursive
@ -23,6 +25,8 @@ jobs:
 - job: upload_source
  displayName: 'upload'
  dependsOn: merge
+  pool:
+    vmImage: 'ubuntu-latest'
  steps:
  - template: ./sync-source.yml
    parameters:
--- a/.ci/yuzu-mainline-step2.yml
+++ b/.ci/yuzu-mainline-step2.yml
@ -66,5 +66,7 @@ stages:
  jobs:
  - job: github
    displayName: 'github'
+    pool:
+      vmImage: ubuntu-latest
    steps:
    - template: ./templates/release-github.yml
--- a/.ci/yuzu-patreon-step2.yml
+++ b/.ci/yuzu-patreon-step2.yml
@ -29,5 +29,7 @@ stages:
  jobs:
    - job: release
      displayName: 'source'
+      pool:
+        vmImage: 'ubuntu-latest'
      steps:
        - template: ./templates/release-private-tag.yml