diff options
| author | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-29 17:23:29 -0400 |
|---|---|---|
| committer | jacobkeeler <jacob.keeler@livioradio.com> | 2019-04-29 17:23:29 -0400 |
| commit | dc906fbd1b3609c049d96d82f443fb678dd84d6f (patch) | |
| tree | f52751104a9e7ab9c010143f878bcf01a4b23863 | |
| parent | 9165e83afbb7c852d90108dbff2e458ca10f1fae (diff) | |
| download | sdl_core-dc906fbd1b3609c049d96d82f443fb678dd84d6f.tar.gz | |
Update style script
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | tools/infrastructure/check_style.sh | 2 | ||||
| -rwxr-xr-x | tools/infrastructure/git-hooks/pre-commit | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 7060f4f33f..643597354c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ addons: before_install: - sudo apt-get update - sudo apt-get install libssl-dev libbluetooth3 libbluetooth-dev libudev-dev cmake html2text lcov git cmake automake1.11 build-essential libavahi-client-dev sqlite3 libsqlite3-dev libgtest-dev bluez-tools libpulse-dev libusb-1.0.0-dev cppcheck - - sudo apt-get install -f clang-format-3.6 + - sudo apt-get install -f clang-format-6.0 script: - cppcheck --force -isrc/3rd_party -isrc/3rd_party-static --quiet --error-exitcode=1 src diff --git a/tools/infrastructure/check_style.sh b/tools/infrastructure/check_style.sh index 08ae1b9860..006dd340d9 100755 --- a/tools/infrastructure/check_style.sh +++ b/tools/infrastructure/check_style.sh @@ -27,7 +27,7 @@ # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -FORMATER=clang-format-3.6 +FORMATER=clang-format-6.0 INSTALL_CMD="sudo apt-get install -f $FORMATER" if [ "$1" = "--help" ] diff --git a/tools/infrastructure/git-hooks/pre-commit b/tools/infrastructure/git-hooks/pre-commit index 9c46f195f3..710f0656c3 100755 --- a/tools/infrastructure/git-hooks/pre-commit +++ b/tools/infrastructure/git-hooks/pre-commit @@ -72,10 +72,10 @@ if [ "$?" -ne "0" ]; then exit 1 fi -# Auto update c++ files with clang-format-3.6 -CLANG_FORMAT=clang-format-3.6 +# Auto update c++ files with clang-format-6.0 +CLANG_FORMAT=clang-format-6.0 # Verify clang-format -CLANG_FORMAT_REQUIRED_VERSION=3.6 +CLANG_FORMAT_REQUIRED_VERSION=6.0 CLANG_FORMAT_CURRENT_VERSION=$($CLANG_FORMAT -version) if [[ $CLANG_FORMAT_CURRENT_VERSION != *$CLANG_FORMAT_REQUIRED_VERSION* ]] then |