summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.ci/templates/merge-private.yml4
-rw-r--r--.ci/templates/merge.yml4
-rw-r--r--.ci/yuzu-mainline-step2.yml2
-rw-r--r--.ci/yuzu-patreon-step2.yml2
4 files changed, 12 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 @@
1jobs: 1jobs:
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 @@
1jobs: 1jobs:
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:
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:
66 jobs: 66 jobs:
67 - job: github 67 - job: github
68 displayName: 'github' 68 displayName: 'github'
69 pool:
70 vmImage: ubuntu-latest
69 steps: 71 steps:
70 - template: ./templates/release-github.yml 72 - 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:
29 jobs: 29 jobs:
30 - job: release 30 - job: release
31 displayName: 'source' 31 displayName: 'source'
32 pool:
33 vmImage: 'ubuntu-latest'
32 steps: 34 steps:
33 - template: ./templates/release-private-tag.yml 35 - template: ./templates/release-private-tag.yml