0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-27 19:28:52 +02:00

travis.yml: Update target matrix.

This commit is contained in:
Jason Volk 2017-03-10 07:19:13 -08:00
parent b592b69b86
commit b81e9accb2

View file

@ -17,24 +17,24 @@ notifications:
matrix: matrix:
include: include:
- os: linux # - os: linux
dist: precise # dist: precise
group: stable # group: stable
compiler: gcc-4.9 # compiler: gcc-4.9
addons: # addons:
apt: # apt:
sources: # sources:
- ubuntu-toolchain-r-test # - ubuntu-toolchain-r-test
packages: # packages:
- gcc-4.9 # - gcc-4.9
- g++-4.9 # - g++-4.9
- ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev'] # - ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev']
env: # env:
- CCOMPILER=gcc-4.9 # - CCOMPILER=gcc-4.9
- CXXCOMPILER=g++-4.9 # - CXXCOMPILER=g++-4.9
- 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
- os: linux - os: linux
dist: precise dist: precise
@ -75,59 +75,59 @@ matrix:
- 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
- os: linux # - os: linux
dist: precise # dist: precise
group: unstable # group: unstable
sudo: false # sudo: false
compiler: clang-3.6 # compiler: clang-3.6
addons: # addons:
apt: # apt:
sources: # sources:
- ubuntu-toolchain-r-test # - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6 # - llvm-toolchain-precise-3.6
packages: # packages:
- clang-3.6 # - clang-3.6
- ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev'] # - ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev']
env: # env:
- CCOMPILER=clang-3.6 # - CCOMPILER=clang-3.6
- CXXCOMPILER=clang++-3.6 # - CXXCOMPILER=clang++-3.6
- 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
- os: linux - os: linux
dist: trusty dist: trusty
group: unstable group: unstable
sudo: required sudo: required
compiler: clang-3.8 compiler: clang-3.9
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-trusty-3.8 - llvm-toolchain-trusty-3.9
packages: packages:
- clang-3.8 - clang-3.9
- gcc-4.9 - gcc-5
- g++-4.9 - g++-5
- ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev'] - ['automake', 'autoconf', 'autoconf2.13', 'autoconf-archive', 'libtool', 'shtool', 'libsqlite3-dev']
env: env:
- CCOMPILER=clang-3.8 - CCOMPILER=clang-3.9
- CXXCOMPILER=clang++-3.8 - CXXCOMPILER=clang++-3.9
- 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
- os: osx # - os: osx
compiler: clang # compiler: clang
env: # env:
- CCOMPILER=clang # - CCOMPILER=clang
- CXXCOMPILER=clang++ # - CXXCOMPILER=clang++
- 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
cache: cache:
apt: apt:
@ -143,6 +143,7 @@ script:
- $CC --version - $CC --version
- $CXX --version - $CXX --version
- time bash autogen.sh - time bash autogen.sh
- time ./configure --with-shared-sqlite $WITH_INCLUDED_BOOST $WITH_INCLUDED_ROCKSDB $WITH_INCLUDED_JS CC=$CC CXX=$CXX #- time ./configure $WITH_INCLUDED_BOOST $WITH_INCLUDED_ROCKSDB $WITH_INCLUDED_JS CC=$CC CXX=$CXX
- time ./configure $WITH_INCLUDED_BOOST $WITH_INCLUDED_ROCKSDB CC=$CC CXX=$CXX
- time make -j4 - time make -j4
- time make -j4 install - time make -j4 install