diff --git a/.travis.yml b/.travis.yml index e570de04b..e2b061f40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,22 +18,24 @@ git: matrix: include: - os: linux - dist: xenial + dist: trusty compiler: g++-6 + sudo: required addons: apt: sources: - ubuntu-toolchain-r-test packages: - - gcc-6 - - g++-6 + - ['gcc-6', 'g++-6'] + - ['libssl-dev', 'libsodium-dev'] - ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool'] env: - CCOMPILER=gcc-6 - CXXCOMPILER=g++-6 - WITH_INCLUDED_BOOST=--with-included-boost - WITH_INCLUDED_ROCKSDB=--with-included-rocksdb=shared - - WITH_INCLUDED_JS=#--with-included-js=shared + - WITH_INCLUDED_JS= + # - WITH_INCLUDED_JS=--with-included-js=shared # - os: linux # dist: xenial @@ -69,10 +71,6 @@ matrix: # #osx_image: xcode7.3 -cache: - apt: - ccache: - script: - export CC=$CCOMPILER CXX=$CXXCOMPILER - git rev-parse --verify HEAD