diff --git a/utils/travis/common.sh b/utils/travis/common.sh index b5af179..4561b8f 100644 --- a/utils/travis/common.sh +++ b/utils/travis/common.sh @@ -1,97 +1,28 @@ #!/bin/bash -e # Compatibility with Travis-CI and GitLab-CI if [ ! -z ${TRAVIS_BUILD_DIR} ]; then export BUILD_DIR=${TRAVIS_BUILD_DIR} else export BUILD_DIR="$(dirname "$(readlink -f "${0}")")/../../" fi export CPUS_USED=2 if command -v nproc >/dev/null; then export CPUS_USED=$(nproc) fi if [[ ${PLATFORM} == "ubuntu-touch" ]]; then export BUILD_SYSTEM="cmake" elif [[ ${PLATFORM} == "" ]]; then # currently there's only linux-desktop & ut # otherwise other parameters (as TRAVIS_OS_NAME) could be checked export PLATFORM="linux-desktop" fi echo_env() { echo "PLATFORM=${PLATFORM}" echo "BUILD_SYSTEM=${BUILD_SYSTEM}" echo "CPUS_USED=${CPUS_USED}" echo "BUILD_DIR=$(readlink -f ${BUILD_DIR})" } - -add_linux-desktop_apt_repos() { - sudo apt-get install dirmngr - - # trusty backports - sudo bash -c "echo deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse >> /etc/apt/sources.list" - - # Qt 5.9 repository - sudo add-apt-repository -y ppa:beineri/opt-qt-5.10.1-trusty -} - -add_ubuntu-touch_apt_repos() { - sudo add-apt-repository ppa:bhdouglass/clickable -y -} - -install_kf5() { - wget -c "https://github.com/kf5builds/precompiled-kf5-linux/releases/download/kf5.50/kf5-5.50.0-Release-ubuntu-trusty-amd64.tar.xz" - mkdir /tmp/kf5 - tar xf kf5-5.50.0-Release-ubuntu-trusty-amd64.tar.xz -C /tmp/kf5 - sudo cp -rf /tmp/kf5/* /opt/qt*/ -} - -install_gloox() { - # download - wget -c "https://github.com/JBBgameich/precompiled-kf5-linux/releases/download/KF5.40/libgloox17_1.0.20-1_amd64.deb" - wget -c "https://github.com/JBBgameich/precompiled-kf5-linux/releases/download/KF5.40/libgloox-dev_1.0.20-1_amd64.deb" - - # install debs and install possible missing dependencies - sudo dpkg -i libgloox*.deb || sudo apt-get -f -y install - - # clean up - rm libgloox*.deb -} - -install_linux-desktop_deps() { - add_linux-desktop_apt_repos - - sudo apt-get update - sudo apt-get install -y -t trusty-backports \ - cmake \ - build-essential \ - ninja-build \ - zlib1g-dev \ - qt510base \ - qt510script \ - qt510declarative \ - qt510tools \ - qt510x11extras \ - qt510svg \ - qt510quickcontrols2 - - install_kf5 - install_gloox -} - -install_ubuntu-touch_deps() { - add_ubuntu-touch_apt_repos - - sudo apt-get update - sudo apt-get install clickable - clickable setup-docker -} - -env_setup() { - if [ -f /opt/qt5*/bin/qt5*-env.sh ]; then - echo "I: Setting up custom Qt installation..." - source /opt/qt5*/bin/qt5*-env.sh - fi -} diff --git a/utils/travis/dependencies.sh b/utils/travis/dependencies.sh deleted file mode 100755 index aa13aae..0000000 --- a/utils/travis/dependencies.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -e -. utils/travis/common.sh - -if [ $PLATFORM != "ubuntu-touch" ]; then - sudo apt update -fi - -echo "*****************************************" -echo "Fetching dependencies" -echo "^^^^^^^^^^^^^^^^^^^^^" -echo_env -echo "*****************************************" - -if [ ${PLATFORM} == "linux-desktop" ]; then - install_linux-desktop_deps -elif [ ${PLATFORM} == "ubuntu-touch" ]; then - install_ubuntu-touch_deps -else - echo "Can't build on \"${TRAVIS_OS_NAME}\"" - exit 1 -fi