From c6be6c2b5e8950006f6fd21d32e7f1a9d087af93 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 11:17:18 +0100 Subject: [PATCH 1/7] fix_ci_ubuntu18.4 --- .travis.yml | 31 +++++++++++++++---------------- ci/install.sh | 28 ++++++++++------------------ 2 files changed, 25 insertions(+), 34 deletions(-) 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 - From 677b02f35b29772a69725e9480399e7758103a16 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 12:03:00 +0100 Subject: [PATCH 2/7] Try 2. --- ci/install.sh | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/ci/install.sh b/ci/install.sh index ac8af830..d9cb5458 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -5,19 +5,12 @@ set -x # Prints every command # This file is only used from Travis CI, where the only Linux distro used is Ubuntu if [[ "$(uname -s)" == 'Linux' ]]; then - sudo apt-get update - sudo apt-get install cmake - sudo apt-get install zlib1g-dev libssh-dev python3-pip libxml2-utils - - if [ -n "$WITH_VALGRIND" ]; then - sudo apt-get install valgrind - fi - sudo pip install virtualenv - virtualenv conan - source conan/bin/activate - pip install conan==1.30.2 - pip install codecov - pip install lxml + sudo apt update --yes + sudo apt install --yes cmake + sudo apt install --yes zlib1g-dev libssh-dev python3-pip libxml2-utils + sudo apt install --yes valgrind + sudo apt autoremove --yes + sudo pip3 install --upgrade pip fi python3 --version From 512875dbbdd2d97b110b5dd10bd3a80d12ca87e0 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 12:34:19 +0100 Subject: [PATCH 3/7] Try 3. --- ci/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/install.sh b/ci/install.sh index d9cb5458..9b14ce93 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -8,9 +8,10 @@ if [[ "$(uname -s)" == 'Linux' ]]; then sudo apt update --yes sudo apt install --yes cmake sudo apt install --yes zlib1g-dev libssh-dev python3-pip libxml2-utils - sudo apt install --yes valgrind + if [ -n "$WITH_VALGRIND" ]; then + sudo apt install --yes valgrind + fi sudo apt autoremove --yes - sudo pip3 install --upgrade pip fi python3 --version From ad99ded33335da32148b22823db976f1ae90aa5f Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 13:45:33 +0100 Subject: [PATCH 4/7] Try 4. --- ci/install.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/ci/install.sh b/ci/install.sh index 9b14ce93..874675df 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -4,6 +4,7 @@ set -x # Prints every command # This file is only used from Travis CI, where the only Linux distro used is Ubuntu +pip=pip3 if [[ "$(uname -s)" == 'Linux' ]]; then sudo apt update --yes sudo apt install --yes cmake @@ -12,17 +13,20 @@ if [[ "$(uname -s)" == 'Linux' ]]; then sudo apt install --yes valgrind fi sudo apt autoremove --yes + if [ -n "$WITH_VALGRIND" ]; then + sudo apt-get install valgrind + fi + pip=pip fi -python3 --version - -sudo pip3 install virtualenv +sudo $pip install virtualenv virtualenv conan source conan/bin/activate -pip3 install conan==1.30.2 -pip3 install codecov -pip3 install lxml +$pip3 install conan==1.30.2 +$pip3 install codecov +$pip3 install lxml +python3 --version conan --version conan config set storage.path=~/conanData conan profile new default --detect From 4bca4fc06b3b6104c0f04097807de3dcdccfc1be Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 14:03:33 +0100 Subject: [PATCH 5/7] Give up. Restore original script and comment off/exclude 18.04 --- .travis.yml | 30 +++++++++++++++--------------- ci/install.sh | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91cda2fc..550e42b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,21 +26,21 @@ matrix: 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 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 874675df..6d520d27 100755 --- a/ci/install.sh +++ b/ci/install.sh @@ -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 -pip=pip3 +python --version +python3 --version + if [[ "$(uname -s)" == 'Linux' ]]; then - sudo apt update --yes - sudo apt install --yes cmake - sudo apt install --yes zlib1g-dev libssh-dev python3-pip libxml2-utils - if [ -n "$WITH_VALGRIND" ]; then - sudo apt install --yes valgrind + 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 autoremove --yes + if [ -n "$WITH_VALGRIND" ]; then sudo apt-get install valgrind fi - pip=pip + sudo pip install virtualenv + virtualenv conan + source conan/bin/activate + 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 -sudo $pip install virtualenv -virtualenv conan -source conan/bin/activate -$pip3 install conan==1.30.2 -$pip3 install codecov -$pip3 install lxml - -python3 --version conan --version conan config set storage.path=~/conanData conan profile new default --detect @@ -34,3 +43,4 @@ conan profile new default --detect if [[ "$(uname -s)" == 'Linux' ]]; then conan profile update settings.compiler.libcxx=libstdc++11 default fi + From 6fb7a0f9d5995be5a7bb210c8a26d8cb130f25e2 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 14:30:01 +0100 Subject: [PATCH 6/7] I thought the 18.04 request was commented off. Apparently not. Throw it away. Shshshssssss. FFfffff. --- .travis.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 550e42b5..8ddf2bea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,22 +26,6 @@ matrix: 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 dist: focal From 376ee55e7acefaf7a12ed9009c57011802072fc1 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Sun, 11 Apr 2021 14:57:07 +0100 Subject: [PATCH 7/7] Commented off code was good. WebUI confused me. Manually go back (apparently no reverse gear on git). --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8ddf2bea..550e42b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,22 @@ matrix: 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 dist: focal