diff options
| -rw-r--r-- | .travis.yml | 41 |
1 files changed, 13 insertions, 28 deletions
diff --git a/.travis.yml b/.travis.yml index a0a7148..aa476a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,29 +1,26 @@ -language: c++ +language: cpp +dist: focal -matrix: +jobs: include: # Clang on OSX - env: MATRIX_EVAL="" CONF="--disable-output-uhd" os: osx - osx_image: xcode11 + osx_image: xcode12.2 compiler: clang - env: MATRIX_EVAL="" CONF="" os: osx - osx_image: xcode11 + osx_image: xcode12.2 compiler: clang # GCC builds on Linux - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-zeromq --disable-output-uhd" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-zeromq --disable-output-uhd" os: linux - dist: bionic - sudo: required arch: amd64 compiler: gcc addons: &linuxaddons apt: - sources: &sources - - sourceline: 'ppa:ubuntu-toolchain-r/test' packages: &packages - libzmq3-dev - libzmq5 @@ -32,54 +29,42 @@ matrix: - libcurl4-openssl-dev - libfftw3-dev # libuhd-dev is not allowed - - g++-9 + - g++-10 - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-output-uhd --enable-output-raw" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-output-uhd --enable-output-raw" os: linux - dist: bionic - sudo: required arch: amd64 compiler: gcc addons: *linuxaddons - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-output-uhd --disable-native" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-output-uhd --disable-native" os: linux - dist: bionic - sudo: required arch: amd64 compiler: gcc addons: *linuxaddons - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-output-uhd --enable-trace" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-output-uhd --enable-trace" os: linux - dist: bionic - sudo: required arch: amd64 compiler: gcc addons: *linuxaddons # ARM64 builds - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-output-uhd" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-output-uhd" os: linux - dist: bionic - sudo: required arch: arm64 compiler: gcc addons: *linuxaddons - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--disable-output-uhd --disable-native" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--disable-output-uhd --disable-native" os: linux - dist: bionic - sudo: required arch: arm64 compiler: gcc addons: *linuxaddons # For EasyDAB, which should be an armhf build instead - - env: MATRIX_EVAL="CC=gcc-9 CXX=g++-9" CONF="--enable-easydabv3 --disable-output-uhd --enable-fast-math --disable-native" + - env: MATRIX_EVAL="CC=gcc-10 CXX=g++-10" CONF="--enable-easydabv3 --disable-output-uhd --enable-fast-math --disable-native" os: linux - dist: bionic - sudo: required arch: amd64 compiler: gcc addons: *linuxaddons |