X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=.travis.yml;h=f6d729f233ab0a61775a87cccdc79ff761565d59;hb=096d45a878ba9606f1677f66d346b14c3c274fa5;hp=2ddc4c34b02ecadc95fe377d31b9ef4f586d5f06;hpb=544d0e288d764cc03ff7b7e777aa7487f8403156;p=notmuch

diff --git a/.travis.yml b/.travis.yml
index 2ddc4c34..f6d729f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,18 @@
 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'
+    packages:
+    - dtach
+    - libxapian-dev
+    - libgmime-2.6-dev
+    - libtalloc-dev
+    - python3-sphinx
+    - gpgsm
 
 script:
   - ./configure