Give up. Restore original script and comment off/exclude 18.04

main
Robin Mills 4 years ago
parent ad99ded333
commit 4bca4fc06b

@ -26,21 +26,21 @@ matrix:
env: env:
- BUILD_TYPE="Debug" - BUILD_TYPE="Debug"
- name: "Ubuntu 18.04 - gcc (Release)" # - name: "Ubuntu 18.04 - gcc (Release)"
os: linux # os: linux
dist: bionic # dist: bionic
sudo: required # sudo: required
compiler: gcc # compiler: gcc
env: # env:
- BUILD_TYPE="Release" # - BUILD_TYPE="Release"
#
- name: "Ubuntu 18.04 - gcc (Debug)" # - name: "Ubuntu 18.04 - gcc (Debug)"
os: linux # os: linux
dist: bionic # dist: bionic
sudo: required # sudo: required
compiler: gcc # compiler: gcc
env: # env:
- BUILD_TYPE="Debug" # - BUILD_TYPE="Debug"
- name: "Ubuntu 20.04 - gcc (Release)" - name: "Ubuntu 20.04 - gcc (Release)"
os: linux os: linux

@ -4,29 +4,38 @@ set -x # Prints every command
# This file is only used from Travis CI, where the only Linux distro used is Ubuntu # This file is only used from Travis CI, where the only Linux distro used is Ubuntu
pip=pip3 python --version
python3 --version
if [[ "$(uname -s)" == 'Linux' ]]; then if [[ "$(uname -s)" == 'Linux' ]]; then
sudo apt update --yes sudo apt-get update
sudo apt install --yes cmake
sudo apt install --yes zlib1g-dev libssh-dev python3-pip libxml2-utils sudo apt-get install cmake
if [ -n "$WITH_VALGRIND" ]; then if [[ "$(lsb_release -cs)" == 'focal' ]]; then
sudo apt install --yes valgrind # 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 fi
sudo apt autoremove --yes
if [ -n "$WITH_VALGRIND" ]; then if [ -n "$WITH_VALGRIND" ]; then
sudo apt-get install valgrind sudo apt-get install valgrind
fi fi
pip=pip sudo pip install virtualenv
fi virtualenv conan
source conan/bin/activate
sudo $pip install virtualenv pip install conan==1.30.2
pip install codecov
pip install lxml
else
sudo pip3 install virtualenv
virtualenv conan virtualenv conan
source conan/bin/activate source conan/bin/activate
$pip3 install conan==1.30.2 pip3 install conan==1.30.2
$pip3 install codecov pip3 install codecov
$pip3 install lxml pip3 install lxml
fi
python3 --version
conan --version conan --version
conan config set storage.path=~/conanData conan config set storage.path=~/conanData
conan profile new default --detect conan profile new default --detect
@ -34,3 +43,4 @@ conan profile new default --detect
if [[ "$(uname -s)" == 'Linux' ]]; then if [[ "$(uname -s)" == 'Linux' ]]; then
conan profile update settings.compiler.libcxx=libstdc++11 default conan profile update settings.compiler.libcxx=libstdc++11 default
fi fi

Loading…
Cancel
Save