X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=.travis.yml;h=f9516bdee73f5c1f96b60fb9b7ac99322ee43053;hp=dbd6434e6ab3dcc66b3a52626f983b5e6960a9db;hb=ff3d873f0b80b023764fe9d3fc0609b81d82775e;hpb=f92342cb76fa3e1fa2f1c2e727f8ddf1a5c21b7d

diff --git a/.travis.yml b/.travis.yml
index dbd6434e..f9516bde 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,23 @@
 language: c
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install dtach libxapian-dev libgmime-2.6-dev libtalloc-dev python-sphinx
 
-  # Notmuch requires zlib 1.2.5.2, unfortunately travis runs on Ubuntu 12.04LTS which
-  # ships with zlib 1.2.3.3. We need to update to zlib 1.2.5.2 to be able to build.
-  # TODO: Watch https://github.com/travis-ci/travis-ci/issues/2046 and remove
-  #       this hack once travis-ci switches to Ubuntu 14.04
-  - wget 'https://github.com/notmuch/travis-files/raw/master/zlib1g-dev_1.2.8.dfsg-1ubuntu1_amd64.deb'
-  - wget 'https://github.com/notmuch/travis-files/raw/master/zlib1g_1.2.8.dfsg-1ubuntu1_amd64.deb'
-  - sudo dpkg -i zlib1g-dev_1.2.8.dfsg-1ubuntu1_amd64.deb zlib1g_1.2.8.dfsg-1ubuntu1_amd64.deb
-  - sudo apt-get install -f
+dist: xenial
+
+addons:
+  apt:
+    sources:
+    - sourceline: 'ppa:xapian-backports/ppa'
+    - sourceline: 'ppa:notmuch/notmuch'
+    packages:
+    - dtach
+    - libxapian-dev
+    - libgmime-3.0-dev
+    - libtalloc-dev
+    - python3-sphinx
+    - gpgsm
 
 script:
   - ./configure
+  - make download-test-databases
   - make test
 
 notifications: