Browse Source

Merge pull request #10002 from Chocobo1/travisci

Upgrade TravisCI to xenial
adaptive-webui-19844
sledgehammer999 6 years ago committed by GitHub
parent
commit
fd310e4e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      .travis.yml

24
.travis.yml

@ -4,6 +4,8 @@ os:
- linux - linux
- osx - osx
dist: xenial
env: env:
matrix: matrix:
# Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
@ -37,9 +39,6 @@ cache:
directories: directories:
- $HOME/hombebrew_cache - $HOME/hombebrew_cache
# opt-in Ubuntu Trusty
dist: trusty
addons: addons:
coverity_scan: coverity_scan:
project: project:
@ -51,21 +50,16 @@ addons:
notification_email: sledgehammer999@qbittorrent.org notification_email: sledgehammer999@qbittorrent.org
apt: apt:
sources: sources:
# sources list: https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
- ubuntu-toolchain-r-test
#- boost-latest
- sourceline: 'ppa:qbittorrent-team/qbittorrent-stable' - sourceline: 'ppa:qbittorrent-team/qbittorrent-stable'
- sourceline: 'ppa:beineri/opt-qt551-trusty'
- sourceline: 'ppa:adrozdoff/cmake'
packages: packages:
# packages list: https://github.com/travis-ci/apt-package-whitelist/blob/master/ubuntu-precise # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
- [autoconf, automake, colormake] - [autoconf, automake, colormake]
- [cmake, ninja-build] - [ninja-build]
- libssl-dev - libssl-dev
- [libboost-dev, libboost-system-dev] - [libboost-dev, libboost-system-dev]
- libtorrent-rasterbar-dev - libtorrent-rasterbar-dev
- [qt55base, qt55svg, qt55tools] - [qtbase5-dev, qttools5-dev-tools, libqt5svg5-dev]
- [gcc-5, g++-5]
before_install: before_install:
# only allow specific build for coverity scan, others will stop # only allow specific build for coverity scan, others will stop
@ -88,11 +82,6 @@ before_install:
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
# setup virtual display for after_success target # setup virtual display for after_success target
if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ; if [ "$gui" = true ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi ;
# Qt 5
PATH=/opt/qt55/bin:${PATH}
export CXX="${CXX}-5" CC="${CC}-5"
fi fi
# print settings # print settings
@ -134,6 +123,7 @@ install:
- | - |
if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then if [ "$TRAVIS_BRANCH" != "$coverity_branch" ]; then
export use_ccache=true export use_ccache=true
ccache -M 512M
ccache -V && ccache --show-stats && ccache --zero-stats ccache -V && ccache --show-stats && ccache --zero-stats
fi fi

Loading…
Cancel
Save