diff options
| -rw-r--r-- | .travis.yml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 18f39667..66150e9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,20 +8,20 @@ matrix: include: - os: linux dist: bionic - env: CPU="intel" ARCH="linux" + env: MODERN="yes" - os: linux dist: xenial - env: CPU="intel" ARCH="linux" + env: MODERN="no" - os: linux dist: trusty - env: CPU="intel" ARCH="linux" + env: MODERN="no" - os: linux dist: xenial arch: arm64 - env: CPU="arm64" ARCH="linux" CPU_TARGET="aarch64-softmmu" + env: MODERN="no" CPU_TARGET="aarch64-softmmu" - os: osx osx_image: xcode11.2 - env: CPU="intel" ARCH="osx" + env: HOMEBREW_NO_ANALYTICS=1 jobs: allow_failures: @@ -34,13 +34,14 @@ env: # - AFL_I_DONT_CARE_ABOUT_MISSING_CRASHES=1 AFL_NO_UI=1 AFL_BENCH_JUST_ONE=1 before_install: - - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt update ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc-7 gcc-7-plugin-dev libc++-7-dev ; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew upgrade ; brew install --with-toolchain gcc ; brew install --with-toolchain llvm ; fi + - if [ "$MODERN" = "yes" ]; then sudo apt update ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc-7 gcc-7-plugin-dev libc++-7-dev ; fi + - if [ "$MODERN" = "no" ]; then sudo apt update ; sudo apt upgrade ; sudo apt install -y libtool libtool-bin automake bison libglib2.0 build-essential clang gcc gcc-plugin-dev libc++-dev ; fi script: - gcc -v - clang -v - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make source-only ; fi - - if [ "$TRAVIS_OS_NAME" = "linux" -a "$CPU" = "intel" ]; then make distrib ; fi - - if [ "$CPU" = "arm64" ] ; then make ; cd qemu_mode && sh ./build_qemu_support.sh ; fi + - if [ "$TRAVIS_OS_NAME" = "linux" -a "$TRAVIS_CPU_ARCH" = "amd64" ]; then make distrib ; fi + - if [ "$TRAVIS_CPU_ARCH" = "arm64" ] ; then make ; cd qemu_mode && sh ./build_qemu_support.sh ; fi - make tests |