diff options
| author | Uilian Ries <uilianries@gmail.com> | 2018-11-12 14:49:42 -0200 |
|---|---|---|
| committer | Wouter van Oortmerssen <aardappel@gmail.com> | 2018-11-12 08:49:42 -0800 |
| commit | dd8922878df9351544eda4e50b359c201f475482 (patch) | |
| tree | 656814e028d84a5410ef524f5a3976b1f368fa8f /.travis.yml | |
| parent | ab54e61805321eaea8f0e886531c4f5aa79773c7 (diff) | |
| download | flatbuffers-dd8922878df9351544eda4e50b359c201f475482.tar.gz flatbuffers-dd8922878df9351544eda4e50b359c201f475482.tar.bz2 flatbuffers-dd8922878df9351544eda4e50b359c201f475482.zip | |
Update Conan version Automatically (#5027)
* #5026 Add FindFlatBuffers.cmake to Conan Package
Signed-off-by: Uilian Ries <uilianries@gmail.com>
* #5026 Build Flatbuffers on OSX 10
Signed-off-by: Uilian Ries <uilianries@gmail.com>
* #5026 Auto update Conan package version
Signed-off-by: Uilian Ries <uilianries@gmail.com>
* #5026 Update Conan docker images
Signed-off-by: Uilian Ries <uilianries@gmail.com>
* #5026 Update tag var on Appveyor
Signed-off-by: Uilian Ries <uilianries@gmail.com>
* #5026 Filter appveyor brach name
Signed-off-by: Uilian Ries <uilianries@gmail.com>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml index 40d38302..2d79589a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ env: conan-linux: &conan-linux os: linux - sudo: required + dist: xenial language: python - python: "3.6" + python: "3.7" services: - docker install: @@ -82,7 +82,7 @@ matrix: - make - LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib make test ARGS=-V - bash .travis/check-generate-code.sh - - if [ "$CONAN" == "true" ] && [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo pip install conan && conan create . google/testing -s build_type=$BUILD_TYPE -tf conan/test_package; fi + - 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 os: osx @@ -105,23 +105,23 @@ matrix: - DYLD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/google/grpc/install/lib ./grpctest - <<: *conan-linux - env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=lasote/conangcc49 + env: CONAN_GCC_VERSIONS=4.9 CONAN_DOCKER_IMAGE=conanio/gcc49 - <<: *conan-linux - env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=lasote/conangcc5 + env: CONAN_GCC_VERSIONS=5 CONAN_DOCKER_IMAGE=conanio/gcc5 - <<: *conan-linux - env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=lasote/conangcc6 + env: CONAN_GCC_VERSIONS=6 CONAN_DOCKER_IMAGE=conanio/gcc6 - <<: *conan-linux - env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=lasote/conangcc7 + env: CONAN_GCC_VERSIONS=7 CONAN_DOCKER_IMAGE=conanio/gcc7 - <<: *conan-linux - env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=lasote/conangcc8 + env: CONAN_GCC_VERSIONS=8 CONAN_DOCKER_IMAGE=conanio/gcc8 - <<: *conan-linux - env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=lasote/conanclang39 + env: CONAN_CLANG_VERSIONS=3.9 CONAN_DOCKER_IMAGE=conanio/clang39 - <<: *conan-linux - env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=lasote/conanclang40 + env: CONAN_CLANG_VERSIONS=4.0 CONAN_DOCKER_IMAGE=conanio/clang40 - <<: *conan-linux - env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=lasote/conanclang50 + env: CONAN_CLANG_VERSIONS=5.0 CONAN_DOCKER_IMAGE=conanio/clang50 - <<: *conan-linux - env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=lasote/conanclang60 + env: CONAN_CLANG_VERSIONS=6.0 CONAN_DOCKER_IMAGE=conanio/clang60 - <<: *conan-osx osx_image: xcode7.3 env: CONAN_APPLE_CLANG_VERSIONS=7.3 @@ -132,8 +132,11 @@ matrix: osx_image: xcode9 env: CONAN_APPLE_CLANG_VERSIONS=9.0 - <<: *conan-osx - osx_image: xcode9.3 + osx_image: xcode9.4 env: CONAN_APPLE_CLANG_VERSIONS=9.1 + - <<: *conan-osx + osx_image: xcode10 + env: CONAN_APPLE_CLANG_VERSIONS=10.0 - language: android sudo: true |