diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-28 13:11:48 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2016-11-29 12:37:27 +0000 |
| commit | c807f383a98416858bdc2ee695b1c9e8536234d6 (patch) | |
| tree | adb8166ac4725cdd0854450420135b18c334174e /.travis.yml | |
| parent | 854ef13dfb9c45fd7b026c8156ac43d2d0056717 (diff) | |
| download | dbus-c807f383a98416858bdc2ee695b1c9e8536234d6.tar.gz | |
travis-ci: add an install script instead of open-coding it in .travis.yml
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
[smcv: move comment to install script as suggested]
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98889
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 39 |
1 files changed, 1 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index 03b884f1..ca059e35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,44 +24,7 @@ sudo: required dist: trusty language: c install: - # travis-ci has a sources list for Chrome which doesn't support i386 - - ": | sudo tee /etc/apt/sources.list.d/google-chrome.list" - - test "$ci_host" != mingw || sudo dpkg --add-architecture i386 - - sudo apt-get -qq -y update - - > - test "$ci_host" != mingw || sudo apt-get -qq -y install - binutils-mingw-w64-i686 g++-mingw-w64-i686 wine:i386 - - sudo apt-get -qq -y build-dep dbus - - > - sudo apt-get -qq -y install - automake - autotools-dev - debhelper - dh-autoreconf - doxygen - dpkg-dev - gnome-desktop-testing - libapparmor-dev - libaudit-dev - libcap-ng-dev - libexpat-dev - libglib2.0-dev - libselinux1-dev - libx11-dev - python - python-dbus - python-gi - valgrind - xauth - xmlto - xsltproc - xvfb - # Ubuntu 14.04's autoconf-archive is too old - - > - wget - http://snapshot.debian.org/archive/debian/20160905T163745Z/pool/main/a/autoconf-archive/autoconf-archive_20160320-1_all.deb - - 'sudo dpkg -i autoconf-archive_*_all.deb' - - 'rm autoconf-archive_*_all.deb' + - ./tools/ci-install.sh script: # python-dbus and python-gi aren't available to Travis's version of # Python in /opt, which it uses as a default |