summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-08-07 15:12:08 +0200
committerGitHub <noreply@github.com>2020-08-07 15:12:08 +0200
commit62fa00f586ba193e18115062d6e53c1034b3b415 (patch)
tree8e93c2632ffe7fc374d0bc7a1c0b45110a9893fa
parentMerge pull request #4501 from lioncash/is_base_of (diff)
parentci: Make use of clang-format 10.0 (diff)
downloadyuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.gz
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.bz2
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.lz
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.xz
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.tar.zst
yuzu-62fa00f586ba193e18115062d6e53c1034b3b415.zip
-rw-r--r--.ci/scripts/format/script.sh2
-rwxr-xr-x.travis/clang-format/script.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/.ci/scripts/format/script.sh b/.ci/scripts/format/script.sh
index 5ab828d5e..991fe1552 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-6.0
+CLANG_FORMAT=clang-format-10.0
$CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
diff --git a/.travis/clang-format/script.sh b/.travis/clang-format/script.sh
index 3eff6322f..56a785fe0 100755
--- a/.travis/clang-format/script.sh
+++ b/.travis/clang-format/script.sh
@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
fi
# Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-6.0
+CLANG_FORMAT=clang-format-10.0
$CLANG_FORMAT --version
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then