travis.yml: reduce number of jobs

This commit is contained in:
Przemyslaw Skibinski 2017-02-21 20:44:35 +01:00
parent 346ce32ade
commit 97cfec5e12

View File

@ -7,38 +7,34 @@ matrix:
os: osx os: osx
# Container-based Ubuntu 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes) # Ubuntu 14.04 LTS Server Edition 64 bit
- env: Ubu=12.04cont Cmd="make uasan" - env: Ubu=14.04 Cmd='make test CC=gcc-6 MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"'
os: linux
sudo: false
- env: Ubu=14.04 Cmd='make test CC=clang-4.0 MOREFLAGS="-g -fsanitize=address -fsanitize=undefined"'
os: linux os: linux
dist: trusty dist: trusty
sudo: required sudo: required
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-4.0 - ubuntu-toolchain-r-test
packages: 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 os: linux
dist: trusty dist: trusty
sudo: required sudo: required
addons: addons:
apt: apt:
sources: sources:
- llvm-toolchain-trusty-4.0 - ubuntu-toolchain-r-test
packages: packages:
- libc6-dev-i386 - libc6-dev-i386
- gcc-multilib - gcc-multilib
- clang-4.0 - gcc-6
- gcc-6-multilib
- env: Ubu=14.04 Cmd='cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
# 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'
os: linux os: linux
dist: trusty dist: trusty
sudo: required sudo: required