diff options
| author | Orestis Floros <orestisflo@gmail.com> | 2020-05-01 11:10:05 +0200 |
|---|---|---|
| committer | Orestis Floros <orestisflo@gmail.com> | 2020-05-01 11:19:41 +0200 |
| commit | 84ad5c93db9a604fe4fa78324c6af6b1a8f23e5f (patch) | |
| tree | caf157eeb6424cb7726366cd939ebc887fda6a0b /.travis.yml | |
| parent | aad3cc99c51ac434210d63bd00e397c46a4cb6e7 (diff) | |
travis: update dist, add custom matrix
New matrix for 5 jobs in total.
Updates our checks to bionic & xenial. Trusty could also be
included but it is a bit outdated at this point.
I use bionic to pull a more recent clang-format and use a dedicated job
just to check formatting. An alternative would be to conditionally run
the formatting script only on bionic.
I don't think that there is a better way to expand a `dist` x `compiler`
matrix (except using docker).
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 538e60d..02c9223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,25 @@ os: linux -dist: trusty language: c -compiler: - - gcc - - clang +jobs: + include: + - name: "clang-format check" + dist: bionic + addons: + apt: + packages: + - clang-format-6.0 + script: + - clang-format-6.0 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false) + - dist: xenial + compiler: gcc + - dist: xenial + compiler: clang + - dist: bionic + compiler: gcc + - dist: bionic + compiler: clang + addons: # See http://docs.travis-ci.com/user/apt/ apt: @@ -18,11 +33,8 @@ addons: # xmlto pulls in a2x which we need for generating manpages from asciidoc. - xmlto - libcap2-bin - - clang-format-3.8 - - libllvm3.5 - pulseaudio script: - - clang-format-3.8 -i $(find . -name "*.[ch]" | tr '\n' ' ') && git diff --exit-code || (echo 'Code was not formatted using clang-format!'; false) # TODO: re-enable sanitizers once issues are fixed - autoreconf -fi && mkdir -p build && cd build && (../configure --disable-sanitizers || (cat config.log; false)) && make -j 8 V=1 && ldd ./i3status |& grep -q pulse || (echo "not linked against pulseaudio"; exit 1) - make clean && (../configure --disable-sanitizers --disable-pulseaudio || (cat config.log; false)) && make -j 8 V=1 && ldd ./i3status |& grep -q pulse && (echo "linked against pulseaudio"; exit 1) || true |