From 97cfec5e12b64bb0494f658143080b1735b8df0e Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Tue, 21 Feb 2017 20:44:35 +0100 Subject: [PATCH] travis.yml: reduce number of jobs --- .travis.yml | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 38ed2343..1020df8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,38 +7,34 @@ matrix: os: osx - # Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes) - - env: Ubu=12.04cont Cmd="make uasan" - os: linux - sudo: false - - - env: Ubu=14.04 Cmd='make test CC=clang-4.0 MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"' + # Ubuntu 14.04 LTS Server Edition 64 bit + - env: Ubu=14.04 Cmd='make test CC=gcc-6 MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"' os: linux dist: trusty sudo: required addons: apt: sources: - - llvm-toolchain-trusty-4.0 + - ubuntu-toolchain-r-test packages: - - clang-4.0 + - gcc-6 + - gcc-6-multilib - - env: Ubu=14.04 Cmd='make -C tests test32 CC=clang-4.0 MOREFLAGS="-g -fsanitize=address"' + - env: Ubu=14.04 Cmd='make -C tests test32 CC=gcc-6 MOREFLAGS="-g -fsanitize=address"' os: linux dist: trusty sudo: required addons: apt: sources: - - llvm-toolchain-trusty-4.0 + - ubuntu-toolchain-r-test packages: - libc6-dev-i386 - gcc-multilib - - clang-4.0 + - gcc-6 + - gcc-6-multilib - - # Ubuntu 14.04 LTS Server Edition 64 bit - - env: Ubu=14.04 Cmd='cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && test-pzstd-asan' + - env: Ubu=14.04 Cmd='cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan' os: linux dist: trusty sudo: required