From d69ce4f1cf6b7a1e4dbc35d11d212ef7c3beea65 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Sat, 18 Apr 2020 02:58:08 +0300 Subject: [PATCH] TravisCI: Use libtorrent with deprecated functions disabled for Linux builds --- .travis.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9b8e93df3..aaaf61f9e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,14 +55,13 @@ addons: apt: sources: # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json - - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable' + - sourceline: 'ppa:qbittorrent-team/qbt-libtorrent-travisci' - sourceline: 'ppa:beineri/opt-qt59-xenial' packages: # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty - [autoconf, automake, colormake] - [libboost-dev, libboost-system-dev] - libssl-dev - - libtorrent-rasterbar-dev - [qt59base, qt59svg, qt59tools] - zlib1g-dev # required for Qt 5.9 from 'beineri' PPA @@ -132,7 +131,7 @@ install: ccache -V && ccache --show-stats && ccache --zero-stats fi - | - if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then + if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then wget https://builds.shiki.hu/travis/deb/version if ! cmp --quiet "version" "$HOME/travis/deb/version" ; then echo "Cached files are different from server. Downloading new ones." @@ -141,11 +140,16 @@ install: mkdir "$HOME/travis/deb" cp "version" $HOME/travis/deb cd "$HOME/travis/deb" - wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb - wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb + wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar-dev_1.1.x_amd64.deb + wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar9_1.1.x_amd64.deb fi - sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.2.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar10_1.2.x_amd64.deb" + sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.1.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar9_1.1.x_amd64.deb" + fi + - | + if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then + # Will install latest 1.2.x daily build from the PPA + sudo apt-get -y install libtorrent-rasterbar-dev fi - | if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then