travis: use apt addon to install packages

Looks better. Also, this would be the only way to install deps if we ever
switch to a non-privileged run (if we manage to rid of "sudo dbus-uuidgen").

1 files changed, 49 insertions, 18 deletions

diff --git a/.travis.yml b/.travis.yml
index 231cb890ba..d471f90c50 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,25 +4,48 @@ compiler:
   - gcc
   - clang
 
-before_install:
-  - sudo apt-get update
-  - sudo apt-get install autoconf libtool pkg-config intltool libdbus-glib-1-dev libdbus-1-dev libiw-dev libglib2.0-dev
-    libnl-3-dev libnl-route-3-dev libnl-genl-3-dev ppp-dev libpolkit-gobject-1-dev libgnutls28-dev libgcrypt11-dev
-    uuid-dev libudev-dev libgirepository1.0-dev gobject-introspection gtk-doc-tools
-    libglib2.0-doc libreadline-dev libnewt-dev libnss3-dev iptables make python-software-properties python-gi
-    python-dbus dbus dbus-x11 libjansson4 libjansson-dev
-  - sudo dbus-uuidgen --ensure
-  - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main'
-  - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
-  - sudo apt-get update
-  - sudo apt-get install libnl-3-dev libndp-dev automake libcurl4-gnutls-dev
-
-script: |
-    sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-ifupdown --enable-tests &&
-    make -j4 &&
-    ./contrib/travis/travis-check.sh
-
 addons:
+  apt:
+    sources:
+    - sourceline: 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
+    packages:
+    - autoconf
+    - libtool
+    - pkg-config
+    - intltool
+    - libdbus-glib-1-dev
+    - libdbus-1-dev
+    - libiw-dev
+    - libglib2.0-dev
+    - libnl-3-dev
+    - libnl-route-3-dev
+    - libnl-genl-3-dev
+    - ppp-dev
+    - libpolkit-gobject-1-dev
+    - libgnutls28-dev
+    - libgcrypt11-dev
+    - uuid-dev
+    - libudev-dev
+    - libgirepository1.0-dev
+    - gobject-introspection
+    - gtk-doc-tools
+    - libglib2.0-doc
+    - libreadline-dev
+    - libnewt-dev
+    - libnss3-dev
+    - iptables
+    - make
+    - python-software-properties
+    - python-gi
+    - python-dbus
+    - dbus
+    - dbus-x11
+    - libjansson4
+    - libjansson-dev
+    - libnl-3-dev
+    - libndp-dev
+    - automake
+    - libcurl4-gnutls-dev
   coverity_scan:
     project:
       name: NetworkManager/NetworkManager
@@ -30,6 +53,14 @@ addons:
     build_command: make -j4
     branch_pattern: .*coverity.*
 
+before_install:
+  - sudo dbus-uuidgen --ensure
+
+script: |
+    sh autogen.sh --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-ifupdown --enable-tests &&
+    make -j4 &&
+    ./contrib/travis/travis-check.sh
+
 env:
   global:
     secure: K36MXkcsuDZ0msuEj5zHMmHfv6O725lsXuFdP6AJ3rYWKuLYE1+iNLgIRndNWDK9ckkNQFaCxDY4Z/NCfCYQTGAS9oXR5AwNqNbhOq8XrqdaZ2GX35sob8Tp4B3IsoREkN/UbIkXQKYlA5rUhgtSifUg3EwfeOiFvnLCwHcp0rYHnvT/jaq5vodBbA1jChjezcMHsp43kvPXHpybKRkipb9EzV/V3VtDLLWh9WQBvQNawpsHnT+MXSke1yU1zfNMyD9XiD7VDzCwaTs6LzjoFBLc86QS5U/9W72s0rFe6SbecntQHftknRzSrGiJDNe64wDZN/Wxq1MHxEOFCwDi6vcSwQ+RoTdhyshhfPVY2Mm5soj2w7Dx43Cz0dDZDCMhu5xxzFAFgkieJSfwXbuxga0ds58Ph8MgtDSp3fBRewZwI+vMuzl7a1hGkcqJojrm1lfgAKbNgrNUzQRwbVYAyrpa6/vCbd6ZH4PEtITwLaRf2mz8PG71xiMQguDDDXS8WF0U7Looe+G9ybAUwDS5hqHfeP+3q6bfN5Sg5Zs5QkBIN5LZbeWbPYldOEEDTvo3VI7e84bk7U5qEoUKc0w/tqVF1B5KgNUq6nIkCkmoBx8RFnmjpOHh99IfeRG9nQTRpCaEDvAM4fcRzITzId8dIIfAW/45P3ozzfz/HYiie+o=