Explorar el Código

Merge pull request #4464 from lioncash/format-pass

ci: Make use of clang-format 10.0
bunnei hace 6 años
padre
commit
62fa00f586
Se han modificado 2 ficheros con 2 adiciones y 2 borrados
  1. 1 1
      .ci/scripts/format/script.sh
  2. 1 1
      .travis/clang-format/script.sh

+ 1 - 1
.ci/scripts/format/script.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 fi
 
 
 # Default clang-format points to default 3.5 version one
 # 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
 $CLANG_FORMAT --version
 
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then

+ 1 - 1
.travis/clang-format/script.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .travis*
 fi
 fi
 
 
 # Default clang-format points to default 3.5 version one
 # 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
 $CLANG_FORMAT --version
 
 
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
 if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then