summaryrefslogtreecommitdiffstats
path: root/.ci/templates
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-10-11 22:57:41 +0200
committerameerj <52414509+ameerj@users.noreply.github.com>2021-10-11 22:57:41 +0200
commit1ea303e2afb2eeeda7926e0bf68cc226ffb82924 (patch)
tree3c631753b3a5aac763dc01618495cad11dec2e6f /.ci/templates
parentMerge pull request #7110 from vonchenplus/fix_extract_offline_romefs_error (diff)
downloadyuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.gz
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.bz2
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.lz
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.xz
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.tar.zst
yuzu-1ea303e2afb2eeeda7926e0bf68cc226ffb82924.zip
Diffstat (limited to '.ci/templates')
-rw-r--r--.ci/templates/merge-private.yml4
-rw-r--r--.ci/templates/merge.yml4
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 @@
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: