Merge branch 'master' into travis-matrix

[openjpeg.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index afca888762e4a91ca3615942f23a2c71f07a39f3..e5872a31ec3a86711ca86bea6addcb586fe2558d 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,26 +5,45 @@ os:
 compiler:
   - gcc
   - clang
+  - x86_64-w64-mingw32-gcc
 env:
   - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
   - OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
+  - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
   - OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
   
 matrix:
   exclude:
     - os: osx
       compiler: gcc
+    - os: osx
+      compiler: x86_64-w64-mingw32-gcc
     - compiler: clang
       env: OPJ_CI_ARCH=i386 OPJ_CI_BUILD_CONFIGURATION=Release
+    - compiler: clang
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
+    - os: linux
+      compiler: clang
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Release
     - compiler: gcc
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
+    - compiler: x86_64-w64-mingw32-gcc
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
+    - compiler: x86_64-w64-mingw32-gcc
       env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
     - os: osx
-      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug
+      env: OPJ_CI_ARCH=x86_64 OPJ_CI_BUILD_CONFIGURATION=Debug OPJ_CI_ASAN=1
   
 addons:
   apt:
     packages:
       - 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
 
 install:
   - ./tools/travis-ci/install.sh