Use right exception.

[jelmer/subvertpy.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index f12a1f3be6b3235021edc3f96cf29ed4da04a9fe..6ac583f5eddd09fbd536e8aae60a155a0994ce51 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,14 +3,16 @@ dist: trusty
 addons:
   apt:
     update: true
-    packages: libapr1-dev apache2-dev libaprutil1-dev libdb5.3-dev liblz4-dev libsasl2-dev libperl-dev libserf-dev libsqlite3-dev libtool python-all-dev
+    packages: libapr1-dev libaprutil1-dev libdb5.3-dev liblz4-dev libsasl2-dev libperl-dev libserf-dev libsqlite3-dev libtool python-all-dev libneon27-gnutls-dev
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
 env:
-  - SVN_VERSION=1.10.0
+# SVN 1.10 requires libutf8proc, which isn't available on trusty :(
+#  - SVN_VERSION=1.10.0
+#    SVN_OPTIONS="--with-lz4=internal"
   - SVN_VERSION=1.9.7
   - SVN_VERSION=1.8.19
   - SVN_VERSION=1.7.19
@@ -22,12 +24,14 @@ script:
 install:
     - travis_retry pip install -U pip coverage codecov flake8
 before_install:
-    - wget http://www-eu.apache.org/dist/subversion/subversion-${SVN_VERSION}.tar.gz
+    - wget https://archive.apache.org/dist/subversion/subversion-${SVN_VERSION}.tar.gz
     - tar xvfz subversion-${SVN_VERSION}.tar.gz
     - cd subversion-${SVN_VERSION}
-    - ./configure
+    - ./configure ${SVN_OPTIONS}
     - make
     - sudo make install
+    - sudo ldconfig -v
+    - cd ..
 after_success:
   - python -m coverage combine
   - codecov