try trusty travis beta

diff --git a/.travis.yml b/.travis.yml
index a500e5c14a14e6e63bf661759ef881179426f365..d67ee37845efd130d6e5edcce1d4dd0ceea41065 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: c
 before_install:
 - sudo apt-get update -qq
@@ -5,11 +7,13 @@ before_install:
   cpanminus
 - sudo apt-get install -qq lynx zsh apt-file libtest-most-perl libgetopt-long-descriptive-perl
   libwww-perl liblog-log4perl-perl libdatetime-perl libmodule-runtime-perl libparams-classify-perl
-  libtime-duration-parse-perl
+  libtime-duration-parse-perl curl
 - perl -V
-- wget -qO- https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm | sudo
-  perl - App::cpanminus
-- sudo cpanm -q --skip-satisfied YAML::Tiny Perl::Critic Perl::PrereqScanner PPIx::XPath
+- wget -qO- https://raw.githubusercontent.com/miyagawa/cpanminus/master/cpanm |
+  perl - --sudo App::cpanminus
+# Tree::XPathEngine test is broken :-(
+- cpanm --force --sudo --quiet --no-interactive --skip-satisfied Tree::XPathEngine
+- cpanm --sudo --quiet --no-interactive --skip-satisfied YAML::Tiny Perl::Critic Perl::PrereqScanner PPIx::XPath
 - git clone -q git://github.com/irssi/irssi irssi-head
 - pushd irssi-head
 - ./autogen.sh --with-perl=module 2>/dev/null | tail -n 17

diff --git a/_testing/travis/autoinstall-perl-prereqs.zsh b/_testing/travis/autoinstall-perl-prereqs.zsh
index 4e47b37e3759fe15897b41602594b0816da7ce19..752ca04c9cbaff17cef93e9764dca4310db98d03 100755 (executable)
--- a/_testing/travis/autoinstall-perl-prereqs.zsh
+++ b/_testing/travis/autoinstall-perl-prereqs.zsh
@@ -6,6 +6,8 @@ local -a modlist
 modlist=($(scan-perl-prereqs $filelist))
 echo -n ... >&2
 
+# fixing shitty broken apt-file
+sudo sed -i -e 's,",,g' `find /etc/apt -type f -name sources.list\*` `find /etc/apt/sources.list.d -type f`
 sudo apt-file update
 
 local -a ubu_pkgs