godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41234 from akien-mga/2.1-clang-format-10 

[2.1] Travis: Use clang-format 8 instead of 6
This commit is contained in:
Rémi Verschelde 2020-08-13 23:37:17 +02:00 committed by GitHub
parent 5dac688644 897c53173d
commit 03e90d565b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -19,10 +19,10 @@ matrix:
- env: STATIC_CHECKS=yes - env: STATIC_CHECKS=yes
os: linux os: linux
compiler: gcc compiler: gcc
- env: GODOT_TARGET=x11 TOOLS=yes CACHE_NAME=${GODOT_TARGET}-gcc-tools" - env: GODOT_TARGET=x11 TOOLS=yes CACHE_NAME=${GODOT_TARGET}-gcc-tools
os: linux os: linux
compiler: gcc compiler: gcc
- env: GODOT_TARGET=x11 TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang" - env: GODOT_TARGET=x11 TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
os: linux os: linux
compiler: clang compiler: clang
- env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-gcc - env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-gcc
@ -44,7 +44,7 @@ addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0 - llvm-toolchain-trusty-8
packages: packages:
- build-essential - build-essential
- scons - scons
@ -61,8 +61,7 @@ addons:
- libssl-dev - libssl-dev
# For style checks. # For style checks.
- clang-format-6.0 - clang-format-8
- libstdc++6 # >= 4.9 needed for clang-format-6.0
before_install: before_install:
- if [ "$STATIC_CHECKS" = "yes" ]; then - if [ "$STATIC_CHECKS" = "yes" ]; then

2
misc/travis/clang-format.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
CLANG_FORMAT=clang-format-6.0 CLANG_FORMAT=clang-format-8
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
# Travis only clones the PR branch and uses its HEAD commit as detached HEAD, # Travis only clones the PR branch and uses its HEAD commit as detached HEAD,