travis-ci: Include add ons in matrix

This commit is contained in:
mayeut 2015-10-15 00:58:58 +02:00
parent e734f0522a
commit fd424cfb66
1 changed files with 28 additions and 18 deletions

View File

@ -11,6 +11,10 @@ matrix:
- os: linux - os: linux
compiler: gcc compiler: gcc
env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
addons:
apt:
packages:
- gcc-multilib
- os: linux - os: linux
compiler: gcc compiler: gcc
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
@ -20,26 +24,32 @@ matrix:
- os: linux - os: linux
compiler: x86_64-w64-mingw32-gcc compiler: x86_64-w64-mingw32-gcc
env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
addons:
apt:
packages:
- gcc-mingw-w64-base
- binutils-mingw-w64-x86-64
- gcc-mingw-w64-x86-64
- gcc-mingw-w64
- os: linux - os: linux
compiler: x86_64-w64-mingw32-gcc compiler: x86_64-w64-mingw32-gcc
env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
addons:
apt:
packages:
- gcc-mingw-w64-base
- binutils-mingw-w64-i686
- gcc-mingw-w64-i686
- gcc-mingw-w64
- os: linux - os: linux
compiler: gcc-4.8 compiler: gcc-4.8
env: OPJ_CI_ABI_CHECK=1 env: OPJ_CI_ABI_CHECK=1
addons: addons:
apt: apt:
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
packages: packages:
- gcc-4.8 - gcc-4.8
- gcc-multilib
- gcc-mingw-w64-base
- binutils-mingw-w64-i686
- binutils-mingw-w64-x86-64
- gcc-mingw-w64-i686
- gcc-mingw-w64-x86-64
- gcc-mingw-w64
- libelf-dev - libelf-dev
- elfutils - elfutils
- texinfo - texinfo