diff --git a/.travis.yml b/.travis.yml index 97b2443e0f..f34faf079b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ jobs: addons: apt: packages: - - clang-format-6.0 + - clang-format-8 - gcc-multilib - g++-multilib - doxygen diff --git a/Sming/Arch/Host/Tools/travis/install.sh b/Sming/Arch/Host/Tools/travis/install.sh index fd27cb5ba9..25a5266be5 100755 --- a/Sming/Arch/Host/Tools/travis/install.sh +++ b/Sming/Arch/Host/Tools/travis/install.sh @@ -1,7 +1,16 @@ #!/bin/bash set -ex # exit with nonzero exit code if anything fails -sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-6.0 100 +sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-8 200 + + +sudo update-alternatives --query clang-format + +clang-format --version +whereis clang-format +export CLANG_FORMAT=/usr/bin/clang-format +$CLANG_FORMAT --version + python3 -m pip install -q --upgrade pip if [ "$BUILD_DOCS" == "1" ]; then