[CI] correct build

This commit is contained in:
Edouard DUPIN 2016-10-24 22:48:46 +02:00
parent 706ee6bee4
commit 0ab9485982

View File

@ -1,6 +1,8 @@
language: cpp language: cpp
sudo: false #sudo: false
sudo: required
dist: trusty
branches: branches:
only: only:
@ -14,9 +16,9 @@ addons:
packages: packages:
- g++-4.9 - g++-4.9
- expect - expect
#- binutils-mingw-w64-x86-64 # 64bit MinGW - binutils-mingw-w64-x86-64 # 64bit MinGW
#- gcc-mingw-w64-x86-64 - gcc-mingw-w64-x86-64
#- g++-mingw-w64-x86-64 - g++-mingw-w64-x86-64
matrix: matrix:
include: include:
@ -26,12 +28,12 @@ matrix:
- os: linux - os: linux
env: CONF=debug BUILDER=clang TARGET=Linux env: CONF=debug BUILDER=clang TARGET=Linux
compiler: clang compiler: clang
#- os: linux - os: linux
# env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw env: CONF=release BUILDER=gcc TARGET=Windows TAG=Mingw
# compiler: x86_64-w64-mingw32-gcc compiler: x86_64-w64-mingw32-gcc
#- os: linux - os: linux
# env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p env: CONF=release BUILDER=gcc TARGET=Android TAG=Android DISABLE_PACKAGE=-p
# compiler: gcc compiler: gcc
- os: osx - os: osx
env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs env: CONF=release BUILDER=clang TARGET=MacOs TAG=MacOs
compiler: clang compiler: clang
@ -51,6 +53,8 @@ install:
before_script: before_script:
- cd .. - cd ..
- git clone https://github.com/atria-soft/elog.git
- git clone https://github.com/atria-soft/ememory.git
- git clone https://github.com/generic-library/gtest-lutin.git --recursive - git clone https://github.com/generic-library/gtest-lutin.git --recursive
- git clone https://github.com/generic-library/z-lutin.git --recursive - git clone https://github.com/generic-library/z-lutin.git --recursive
- pwd - pwd