From 6a636dd0f20c9531013eaa9086ccade9fa92e4a9 Mon Sep 17 00:00:00 2001 From: MikeGitb Date: Thu, 3 Sep 2020 10:10:46 +0200 Subject: [PATCH 1/3] [CI] Update travis CI to use only supported ubuntu images --- .travis.yml | 80 +++++++++++------------------------------------------ 1 file changed, 16 insertions(+), 64 deletions(-) diff --git a/.travis.yml b/.travis.yml index bcdc38add7..f1b84e34ee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,80 +11,32 @@ matrix: # linux version have unique dependencies, so we set them up individually # linux version have unique dependencies, so we set them up individually - os: linux - dist: trusty compiler: gcc - sudo: required - addons: - apt: - update: true + dist: bionic env: - - TARGET="trusty" - - DESCRIPTION="Ubuntu Trusty build/test via CMake & gcc" + - DESCRIPTION="Ubuntu Bionic build/test via CMake & gcc" - MATRIX_EVAL="CC=gcc && CXX=g++" - os: linux - dist: trusty compiler: clang - sudo: required - addons: - apt: - update: true - sources: - - ubuntu-toolchain-r-test - packages: - # clang requires newer standard library to work properly - - g++-4.9 - env: - - TARGET="trusty" - - DESCRIPTION="Ubuntu Trusty build/test via CMake & clang" + dist: bionic + env: + - DESCRIPTION="Ubuntu Bionic build/test via CMake & clang" - MATRIX_EVAL="CC=clang && CXX=clang++" - os: linux - dist: trusty - compiler: clang - sudo: required - addons: - apt: - update: true - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - - clang++-3.5 - env: - - TARGET="trusty" - - DESCRIPTION="Ubuntu Trusty build/test via CMake & clang-3.5" - - MATRIX_EVAL="CC=clang-3.5 && CXX=clang++-3.5" - - - os: linux - dist: trusty - sudo: required - addons: - apt: - update: true - sources: - - ubuntu-toolchain-r-test - packages: - - g++-5 - env: - - TARGET="trusty" - - DESCRIPTION="Ubuntu Trusty build/test via CMake & g++5" - - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" + compiler: gcc + dist: focal + env: + - DESCRIPTION="Ubuntu Bionic build/test via CMake & gcc" + - MATRIX_EVAL="CC=gcc && CXX=g++" - os: linux - dist: trusty - sudo: required - addons: - apt: - update: true - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - env: - - TARGET="trusty" - - DESCRIPTION="Ubuntu Trusty build/test via CMake & g++6" - - MATRIX_EVAL="CC=gcc-6 && CXX=g++-6" + compiler: clang + dist: focal + env: + - DESCRIPTION="Ubuntu Bionic build/test via CMake & clang" + - MATRIX_EVAL="CC=clang && CXX=clang++" # OS X Xcode @@ -165,7 +117,7 @@ before_install: install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - tools/linux/scripts/"$TARGET"-install-deps.sh; + tools/linux/scripts/trusty-install-deps.sh; elif [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$TOOL" == "cmake" ]]; then tools/osx/scripts/cmake-brew-install.sh; fi From d57a8272a957312eb85407d4073e57c8866cb76c Mon Sep 17 00:00:00 2001 From: MikeGitb Date: Thu, 3 Sep 2020 10:44:48 +0200 Subject: [PATCH 2/3] [LinuxDeps] Install mpg123 provided by ubuntu package management instead of manual install --- tools/linux/scripts/trusty-install-deps.sh | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/tools/linux/scripts/trusty-install-deps.sh b/tools/linux/scripts/trusty-install-deps.sh index 3a3fd34ce9..0487067b2e 100755 --- a/tools/linux/scripts/trusty-install-deps.sh +++ b/tools/linux/scripts/trusty-install-deps.sh @@ -24,12 +24,5 @@ sudo apt-get -y install \ gstreamer1.0-alsa \ gstreamer1.0-pulseaudio \ gstreamer1.0-plugins-bad \ - libboost-filesystem-dev - -# mpg123 -wget https://sourceforge.net/projects/mpg123/files/mpg123/1.22.4/mpg123-1.22.4.tar.bz2/download -O mpg123-1.22.4.tar.bz2 -tar -xvf mpg123-1.22.4.tar.bz2 && \ - cd mpg123-1.22.4 && \ - ./configure --prefix=/opt/local && \ - make && \ - sudo make install + libboost-filesystem-dev \ + libmpg123-dev \ No newline at end of file From 2a3172d6a4795e1087d48a2a6eaa69815576ee17 Mon Sep 17 00:00:00 2001 From: MikeGitb Date: Thu, 3 Sep 2020 14:01:24 +0200 Subject: [PATCH 3/3] [CI] Deactivate tests on older macos versions with cmake for now --- .travis.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1b84e34ee..2ad7e4363a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,22 +90,23 @@ matrix: - TOOL="xcode-ios-sim" - DESCRIPTION=OS X build/test via Xcode" - # OS X CMake + #OS X CMake - os: osx osx_image: xcode9.2 env: - TOOL="cmake" - DESCRIPTION="OS X build/test via CMake" - - os: osx - osx_image: xcode8.3 - env: - - TOOL="cmake" - - DESCRIPTION="OS X build/test via CMake" - - os: osx - osx_image: xcode7.3 - env: - - TOOL="cmake" - - DESCRIPTION="OS X build/test via CMake" + # TODO: find fast way to install cmake 3.10 on these systems + #- os: osx + # osx_image: xcode8.3 + # env: + # - TOOL="cmake" + # - DESCRIPTION="OS X build/test via CMake" + #- os: osx + # osx_image: xcode7.3 + # env: + # - TOOL="cmake" + # - DESCRIPTION="OS X build/test via CMake" before_install: - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then