travis.yml: Travis-CI became useless and inept I guess at some point because 14.04 is not relevant to us.

This commit is contained in:
Jason Volk 2018-09-04 23:43:49 -07:00
parent 11e14bbb37
commit 45fbcb648d
1 changed files with 20 additions and 23 deletions

View File

@ -2,7 +2,6 @@
# see travis-ci.org for details # see travis-ci.org for details
language: cpp language: cpp
sudo: required
git: git:
submodules: false submodules: false
@ -15,27 +14,25 @@ git:
# on_failure: always # on_failure: always
# on_start: always # on_start: always
matrix: #matrix:
include: # include:
- os: linux # - os: linux
dist: trusty # dist: xenial
compiler: g++-6 # sudo: required
sudo: required # compiler: g++-6
addons: # addons:
apt: # apt:
sources: # packages:
- ubuntu-toolchain-r-test # - ['gcc-6', 'g++-6']
packages: # - ['libssl-dev', 'libsodium-dev']
- ['gcc-6', 'g++-6'] # - ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool']
- ['libssl-dev', 'libsodium-dev'] # env:
- ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool'] # - CCOMPILER=gcc-6
env: # - CXXCOMPILER=g++-6
- CCOMPILER=gcc-6 # - WITH_INCLUDED_BOOST=--with-included-boost
- CXXCOMPILER=g++-6 # - WITH_INCLUDED_ROCKSDB=--with-included-rocksdb=shared
- WITH_INCLUDED_BOOST=--with-included-boost # - WITH_INCLUDED_JS=
- 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 # - os: linux
# dist: xenial # dist: xenial
@ -67,7 +64,7 @@ matrix:
# - LIBTOOLIZE=glibtoolize # - LIBTOOLIZE=glibtoolize
# - WITH_INCLUDED_BOOST=--with-included-boost # - WITH_INCLUDED_BOOST=--with-included-boost
# - WITH_INCLUDED_ROCKSDB=--with-included-rocksdb=shared # - WITH_INCLUDED_ROCKSDB=--with-included-rocksdb=shared
# - WITH_INCLUDED_JS=--with-included-js=shared # # - WITH_INCLUDED_JS=--with-included-js=shared
# #
#osx_image: xcode7.3 #osx_image: xcode7.3