diff --git a/.travis.yml b/.travis.yml index 5db901b2..91cda2fc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,22 +26,21 @@ matrix: env: - BUILD_TYPE="Debug" -# 18.04 fails because it uses python2 ! -# - name: "Ubuntu 18.04 - gcc (Release)" -# os: linux -# dist: bionic -# sudo: required -# compiler: gcc -# env: -# - BUILD_TYPE="Release" -# -# - name: "Ubuntu 18.04 - gcc (Debug)" -# os: linux -# dist: bionic -# sudo: required -# compiler: gcc -# env: -# - BUILD_TYPE="Debug" + - name: "Ubuntu 18.04 - gcc (Release)" + os: linux + dist: bionic + sudo: required + compiler: gcc + env: + - BUILD_TYPE="Release" + + - name: "Ubuntu 18.04 - gcc (Debug)" + os: linux + dist: bionic + sudo: required + compiler: gcc + env: + - BUILD_TYPE="Debug" - name: "Ubuntu 20.04 - gcc (Release)" os: linux diff --git a/ci/install.sh b/ci/install.sh index 6d520d27..ac8af830 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -4,19 +4,10 @@ set -x # Prints every command # This file is only used from Travis CI, where the only Linux distro used is Ubuntu -python --version -python3 --version - if [[ "$(uname -s)" == 'Linux' ]]; then sudo apt-get update - sudo apt-get install cmake - if [[ "$(lsb_release -cs)" == 'focal' ]]; then - # In Ubuntu 20.04 python-pip does not exist. Furthermore we need to have the alias python for python3 - sudo apt-get install zlib1g-dev libssh-dev python3-pip python-is-python3 libxml2-utils - else - sudo apt-get install zlib1g-dev libssh-dev python-pip libxml2-utils - fi + sudo apt-get install zlib1g-dev libssh-dev python3-pip libxml2-utils if [ -n "$WITH_VALGRIND" ]; then sudo apt-get install valgrind @@ -27,15 +18,17 @@ if [[ "$(uname -s)" == 'Linux' ]]; then pip install conan==1.30.2 pip install codecov pip install lxml -else - sudo pip3 install virtualenv - virtualenv conan - source conan/bin/activate - pip3 install conan==1.30.2 - pip3 install codecov - pip3 install lxml fi +python3 --version + +sudo pip3 install virtualenv +virtualenv conan +source conan/bin/activate +pip3 install conan==1.30.2 +pip3 install codecov +pip3 install lxml + conan --version conan config set storage.path=~/conanData conan profile new default --detect @@ -43,4 +36,3 @@ conan profile new default --detect if [[ "$(uname -s)" == 'Linux' ]]; then conan profile update settings.compiler.libcxx=libstdc++11 default fi -