From 37f2a82b95f05439e95f5c4045f1a505dff6b103 Mon Sep 17 00:00:00 2001 From: Laurent Date: Wed, 16 May 2018 19:59:46 +0100 Subject: [PATCH] revert last travis changes --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9639cf822..90dee6dda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,9 @@ language: r r: bioc-devel cache: packages -sudo: true # use container based build system +sudo: false # use container based build system warnings_are_errors: true +dist: trusty # Set CXX1X for R-devel, as R-devel does not detect CXX1X support for gcc 4.6.3, # this was causing mzR installation to fail @@ -14,7 +15,6 @@ before_install: addons: apt: packages: - - libmagick++-dev - libnetcdf-dev - netcdf-bin # libnetcdf-dev doesn't contain nc-config in ubuntu 12.04 (in 16.04 it is part of libnetcdf-dev) - libhdf5-dev