* #4590 Fix Conan build - Create separated build for Conan on master branch - Add Clang 7,8 - Add Gcc 9 Signed-off-by: Uilian Ries <uilianries@gmail.com> * #4590 Do not build Conan for PRs Signed-off-by: Uilian Ries <uilianries@gmail.com>
This commit is contained in:
parent
de9aa0cdee
commit
a0c0131e36
28
.travis.yml
28
.travis.yml
|
@ -22,6 +22,21 @@ conan-linux: &conan-linux
|
||||||
- ./conan/travis/build.sh
|
- ./conan/travis/build.sh
|
||||||
if: tag IS present
|
if: tag IS present
|
||||||
|
|
||||||
|
conan-linux-master: &conan-linux-master
|
||||||
|
os: linux
|
||||||
|
dist: xenial
|
||||||
|
language: python
|
||||||
|
python: "3.7"
|
||||||
|
services:
|
||||||
|
- docker
|
||||||
|
install:
|
||||||
|
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./conan/travis/install.sh; fi'
|
||||||
|
script:
|
||||||
|
- 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./conan/travis/build.sh; fi'
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- master
|
||||||
|
|
||||||
conan-osx: &conan-osx
|
conan-osx: &conan-osx
|
||||||
os: osx
|
os: osx
|
||||||
language: generic
|
language: generic
|
||||||
|
@ -78,7 +93,7 @@ matrix:
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- BUILD_TYPE=Debug
|
- BUILD_TYPE=Debug
|
||||||
- BUILD_TYPE=Release CONAN=true
|
- BUILD_TYPE=Release
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
|
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
|
||||||
|
@ -100,7 +115,6 @@ matrix:
|
||||||
- cmake --build . -- -j${JOBS}
|
- cmake --build . -- -j${JOBS}
|
||||||
- LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
|
- LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
|
||||||
- bash .travis/check-generate-code.sh
|
- bash .travis/check-generate-code.sh
|
||||||
- if [ "$CONAN" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo pip install conan && conan create . flatbuffers/${TRAVIS_BRANCH}@google/testing -s build_type=$BUILD_TYPE -tf conan/test_package; fi
|
|
||||||
|
|
||||||
- language: cpp
|
- language: cpp
|
||||||
os: osx
|
os: osx
|
||||||
|
@ -122,6 +136,8 @@ matrix:
|
||||||
- DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
|
- DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ctest --extra-verbose --output-on-failure
|
||||||
- bash .travis/check-generate-code.sh
|
- bash .travis/check-generate-code.sh
|
||||||
|
|
||||||
|
- <<: *conan-linux-master
|
||||||
|
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
|
env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
|
@ -132,6 +148,8 @@ matrix:
|
||||||
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
|
env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
|
env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8
|
||||||
|
- <<: *conan-linux
|
||||||
|
env: CONAN_GCC_VERSIONS=9 CONAN_DOCKER_IMAGE=conanio/gcc9
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
|
env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
|
@ -140,6 +158,10 @@ matrix:
|
||||||
env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
|
env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50
|
||||||
- <<: *conan-linux
|
- <<: *conan-linux
|
||||||
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
|
env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60
|
||||||
|
- <<: *conan-linux
|
||||||
|
env: CONAN_CLANG_VERSIONS=7.0 CONAN_DOCKER_IMAGE=conanio/clang7
|
||||||
|
- <<: *conan-linux
|
||||||
|
env: CONAN_CLANG_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/clang8
|
||||||
- <<: *conan-osx
|
- <<: *conan-osx
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
env: CONAN_APPLE_CLANG_VERSIONS=7.3
|
env: CONAN_APPLE_CLANG_VERSIONS=7.3
|
||||||
|
@ -153,7 +175,7 @@ matrix:
|
||||||
osx_image: xcode9.4
|
osx_image: xcode9.4
|
||||||
env: CONAN_APPLE_CLANG_VERSIONS=9.1
|
env: CONAN_APPLE_CLANG_VERSIONS=9.1
|
||||||
- <<: *conan-osx
|
- <<: *conan-osx
|
||||||
osx_image: xcode10
|
osx_image: xcode10.2
|
||||||
env: CONAN_APPLE_CLANG_VERSIONS=10.0
|
env: CONAN_APPLE_CLANG_VERSIONS=10.0
|
||||||
|
|
||||||
- language: android
|
- language: android
|
||||||
|
|
Loading…
Reference in New Issue