Skip to content

Move to clang-format-6.0 and cleanup config #3148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2018
Merged

Move to clang-format-6.0 and cleanup config #3148

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@ jobs:
env: NAME="clang-format"
addons:
apt:
sources:
- llvm-toolchain-trusty-6.0
packages:
- clang-format-3.8
- clang-format-6.0
install:
script: |
# Apparently update-alternatives doesn't work in Travis containers
mkdir -p priority-symlinks
ln -s /usr/bin/clang-format-3.8 priority-symlinks/clang-format
export PATH=${PWD}/priority-symlinks:${PATH}

# Now we can do the formatting pass
clang-format --version
git-clang-format-3.8 "${TRAVIS_BRANCH}"
git-clang-format-6.0 --binary clang-format-6.0 "${TRAVIS_BRANCH}"
git diff > formatted.diff
if [[ -s formatted.diff ]] ; then
echo 'Formatting error! The following diff shows the required changes'
Expand Down