From 1ea303e2afb2eeeda7926e0bf68cc226ffb82924 Mon Sep 17 00:00:00 2001
From: ameerj <52414509+ameerj@users.noreply.github.com>
Date: Mon, 11 Oct 2021 16:57:41 -0400
Subject: 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.
---
 .ci/templates/merge-private.yml | 4 ++++
 .ci/templates/merge.yml         | 4 ++++
 .ci/yuzu-mainline-step2.yml     | 2 ++
 .ci/yuzu-patreon-step2.yml      | 2 ++
 4 files changed, 12 insertions(+)

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 @@
 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:
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 @@
 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:
diff --git a/.ci/yuzu-mainline-step2.yml b/.ci/yuzu-mainline-step2.yml
index 3159ce3ed..91e21a126 100644
--- 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
diff --git a/.ci/yuzu-patreon-step2.yml b/.ci/yuzu-patreon-step2.yml
index 3f338e2a0..ad61ac74e 100644
--- 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
-- 
cgit v1.2.3