travis: Prefer apt-get in install field than addons-apt-sources

This commit is contained in:
Lzu Tao 2019-01-11 01:39:34 +07:00
parent 7fe378fc70
commit c99b64af86

View File

@ -6,8 +6,7 @@ matrix:
# OS X Mavericks # OS X Mavericks
- name: (macOS) General Test - name: (macOS) General Test
os: osx os: osx
install: compiler: clang
- export CC=clang
script: script:
- make -C tests test-lz4 MOREFLAGS='-Werror -Wconversion -Wno-sign-conversion' - make -C tests test-lz4 MOREFLAGS='-Werror -Wconversion -Wno-sign-conversion'
- CFLAGS=-m32 make -C tests clean test-lz4-contentSize - CFLAGS=-m32 make -C tests clean test-lz4-contentSize
@ -50,19 +49,14 @@ matrix:
# presume clang >= v3.9.0 # presume clang >= v3.9.0
- name: (Trusty) USan test - name: (Trusty) USan test
dist: trusty dist: trusty
addons: compiler: clang
apt:
packages:
- clang
script: script:
- make usan MOREFLAGS=-Wcomma -Werror - make usan MOREFLAGS=-Wcomma -Werror
- name: (Trusty) valgrind test - name: (Trusty) valgrind test
dist: trusty dist: trusty
addons: install:
apt: - sudo apt-get install -qq valgrind
packages:
- valgrind
script: script:
- make c_standards - make c_standards
- make -C tests test-lz4 test-mem - make -C tests test-lz4 test-mem
@ -74,24 +68,16 @@ matrix:
- name: (Trusty) i386 benchmark + version test - name: (Trusty) i386 benchmark + version test
dist: trusty dist: trusty
addons: install:
apt: - sudo apt-get install -qq python3 libc6-dev-i386 gcc-multilib
packages:
- python3
- libc6-dev-i386
- gcc-multilib
script: script:
- make -C tests test-lz4c32 test-fullbench32 versionsTest - make -C tests test-lz4c32 test-fullbench32 versionsTest
- name: (Trusty) i386 frame + fuzzer test - name: (Trusty) i386 frame + fuzzer test
dist: trusty dist: trusty
addons:
apt:
packages:
- libc6-dev-i386
- gcc-multilib
install: install:
- sudo sysctl -w vm.mmap_min_addr="4096" - sudo apt-get install -qq libc6-dev-i386 gcc-multilib
- sudo sysctl -w vm.mmap_min_addr=4096
script: script:
- make -C tests test-frametest32 test-fuzzer32 - make -C tests test-frametest32 test-fuzzer32
@ -103,23 +89,22 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- gcc-6 - gcc-6
install: env:
- export CC=gcc-6 - CC=gcc-6
script: script:
- make c_standards - make c_standards
- make -C tests test-lz4 MOREFLAGS=-Werror - make -C tests test-lz4 MOREFLAGS=-Werror
- name: (Trusty) arm + aarch64 compilation - name: (Trusty) arm + aarch64 compilation
dist: trusty dist: trusty
addons: install:
apt: - sudo apt-get install -qq
packages: qemu-system-arm
- qemu-system-arm qemu-user-static
- qemu-user-static gcc-arm-linux-gnueabi
- gcc-arm-linux-gnueabi libc6-dev-armel-cross
- libc6-dev-armel-cross gcc-aarch64-linux-gnu
- gcc-aarch64-linux-gnu libc6-dev-arm64-cross
- libc6-dev-arm64-cross
script: script:
- make platformTest CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static - make platformTest CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static
- make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static - make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static
@ -127,7 +112,7 @@ matrix:
- name: (Xenial) gcc-5 compilation - name: (Xenial) gcc-5 compilation
dist: xenial dist: xenial
install: install:
- export CC=gcc-5 - sudo apt-get install -qq libc6-dev-i386 gcc-multilib
script: script:
- make -C tests test-lz4 clean test-lz4c32 MOREFLAGS=-Werror - make -C tests test-lz4 clean test-lz4c32 MOREFLAGS=-Werror
@ -145,23 +130,17 @@ matrix:
- name: (Trusty) PowerPC + PPC64 compilation - name: (Trusty) PowerPC + PPC64 compilation
dist: trusty dist: trusty
addons: install:
apt: - sudo apt-get install -qq qemu-system-ppc qemu-user-static gcc-powerpc-linux-gnu
packages:
- qemu-system-ppc
- qemu-user-static
- gcc-powerpc-linux-gnu
script: script:
- make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static - make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc-static
- make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc64-static MOREFLAGS=-m64 - make platformTest CC=powerpc-linux-gnu-gcc QEMU_SYS=qemu-ppc64-static MOREFLAGS=-m64
- name: (Trusty) scan-build + cppcheck - name: (Trusty) scan-build + cppcheck
dist: trusty dist: trusty
addons: compiler: clang
apt: install:
packages: - sudo apt-get install -qq cppcheck
- clang
- cppcheck
script: script:
- make staticAnalyze - make staticAnalyze
- make cppcheck - make cppcheck
@ -202,7 +181,7 @@ matrix:
&& python3 ~/get-pip.py --user && python3 ~/get-pip.py --user
&& pip3 install --user meson && pip3 install --user meson
script: script:
- meson - meson setup
--buildtype=debug --buildtype=debug
-Db_lundef=false -Db_lundef=false
-Dauto_features=enabled -Dauto_features=enabled