From 10ed3fdfe178c4781c3434850c77be33a51584ca Mon Sep 17 00:00:00 2001 From: Luis Diaz Mas Date: Tue, 11 May 2021 23:14:16 +0200 Subject: [PATCH] ci - Remove old CI script files --- ci/install.sh | 41 ---------------------------------------- ci/run.sh | 52 --------------------------------------------------- 2 files changed, 93 deletions(-) delete mode 100755 ci/install.sh delete mode 100755 ci/run.sh diff --git a/ci/install.sh b/ci/install.sh deleted file mode 100755 index 2fc7da38..00000000 --- a/ci/install.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -set -e # Enables cheking of return values from each command -set -x # Prints every command - -# This file is only used from Travis CI, where the only Linux distro used is Ubuntu - -python3 --version - -if [[ "$(uname -s)" == 'Linux' ]]; then - sudo apt-get update - - sudo apt-get install cmake zlib1g-dev libssh-dev python3-pip libxml2-utils - - if [ -n "$WITH_VALGRIND" ]; then - # https://travis-ci.community/t/clang-10-was-recently-broken-on-linux-unmet-dependencies-for-clang-10-clang-tidy-10-valgrind/11527 - sudo apt-get install -yq --allow-downgrades libc6=2.31-0ubuntu9.2 libc6-dev=2.31-0ubuntu9.2 - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --allow-downgrades --allow-remove-essential --allow-change-held-packages install valgrind - fi - sudo pip3 install virtualenv - virtualenv conan - source conan/bin/activate - pip3 install conan==1.35.2 - pip3 install codecov - pip3 install lxml -else - sudo pip3 install virtualenv - virtualenv conan - source conan/bin/activate - pip3 install conan==1.35.2 - pip3 install codecov - pip3 install lxml -fi - -conan --version -conan config set storage.path=~/conanData -conan profile new default --detect - -if [[ "$(uname -s)" == 'Linux' ]]; then - conan profile update settings.compiler.libcxx=libstdc++11 default -fi - diff --git a/ci/run.sh b/ci/run.sh deleted file mode 100755 index 6bcbfe99..00000000 --- a/ci/run.sh +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -set -e -set -x - -export CMAKE_OPTIONS="$COMMON_CMAKE_OPTIONS -DCMAKE_BUILD_TYPE=$BUILD_TYPE" - -if [ -n "$WITH_COVERAGE" ]; then - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DBUILD_WITH_COVERAGE=ON" -fi - -if [ -n "$WITH_SANITIZERS" ]; then - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DEXIV2_TEAM_USE_SANITIZERS=ON" -fi - -if [ -n "$WITH_VALGRIND" ]; then - export EXIV2_VALGRIND="valgrind --quiet" -fi - -if [[ "$(uname -s)" == 'Darwin' ]]; then - export CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_PREFIX_PATH=/usr/local/opt/gettext/" -fi - - -source conan/bin/activate - -mkdir build && cd build -conan install .. -o webready=True --build missing - -cmake ${CMAKE_OPTIONS} .. -make -j2 - -make tests -make install - -# Check for detecting issues with the installation of headers -if [ `ls install/include/exiv2/ | wc -l` > 10 ]; then - echo Headers installed correctly -else - echo There was some problem with the installation of the public headers - exit 1 -fi - -pushd . -cd bin -$EXIV2_VALGRIND ./unit_tests -popd - -if [ -n "$COVERAGE" ]; then - bash <(curl -s https://codecov.io/bash) -fi -