diff options
Diffstat (limited to '.ci')
| -rw-r--r-- | .ci/scripts/format/script.sh | 2 | ||||
| -rw-r--r-- | .ci/yuzu-mainline-step1.yml | 3 | ||||
| -rw-r--r-- | .ci/yuzu-patreon-step1.yml | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh index 969ab637c..c2550c966 100644 --- a/.ci/scripts/format/script.sh +++ b/.ci/scripts/format/script.sh @@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis fi # Default clang-format points to default 3.5 version one -CLANG_FORMAT=clang-format-10 +CLANG_FORMAT=clang-format-12 $CLANG_FORMAT --version if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then diff --git a/.ci/yuzu-mainline-step1.yml b/.ci/yuzu-mainline-step1.yml index 3fd33d75a..6b6acb5c6 100644 --- a/.ci/yuzu-mainline-step1.yml +++ b/.ci/yuzu-mainline-step1.yml @@ -1,6 +1,9 @@ trigger: - master +pool: + vmImage: 'ubuntu-latest' + stages: - stage: merge displayName: 'merge' diff --git a/.ci/yuzu-patreon-step1.yml b/.ci/yuzu-patreon-step1.yml index cf30397cd..c63d7a066 100644 --- a/.ci/yuzu-patreon-step1.yml +++ b/.ci/yuzu-patreon-step1.yml @@ -1,6 +1,9 @@ trigger: - master +pool: + vmImage: 'ubuntu-latest' + stages: - stage: merge displayName: 'merge' |