From ef67ef31551e6e6401aa1b41295c5b9e1ac35788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 15 Jun 2018 10:13:52 +0200 Subject: [PATCH] Travis: Make dependencies follow the matrix requirements Also make the coverity addon only applied to the static checks build job. (cherry picked from commit c58f73fd3577bff35cac774423b2e98a0820c3b8) --- .travis.yml | 63 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23f52ec9aa0..cb0defdf095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,53 +20,64 @@ matrix: - env: STATIC_CHECKS=yes os: linux compiler: gcc + addons: + apt: + sources: + - llvm-toolchain-trusty-5.0 + packages: + - clang-format-5.0 + + coverity_scan: + project: + name: "godotengine/godot" + description: "Godot Engine Coverity scans" + notification_email: coverity@godotengine.org + build_command_prepend: "" + build_command: "scons p=x11 -j2 $OPTIONS" + branch_pattern: coverity_scan + - env: GODOT_TARGET=x11 TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-gcc os: linux compiler: gcc + addons: + apt: + packages: + - &linux_deps [libasound2-dev, libfreetype6-dev, libgl1-mesa-dev, libglu1-mesa-dev, libx11-dev, libxcursor-dev, libxi-dev, libxinerama-dev, libxrandr-dev] + - env: GODOT_TARGET=x11 TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang os: linux compiler: clang + addons: + apt: + packages: + - *linux_deps + - env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang os: linux compiler: clang + - env: GODOT_TARGET=osx TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-clang os: osx osx_image: xcode9.3 compiler: clang + - env: GODOT_TARGET=iphone TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang os: osx osx_image: xcode9.3 compiler: clang + - env: GODOT_TARGET=server TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-gcc os: linux compiler: gcc + addons: + apt: + packages: + - *linux_deps -addons: - apt: - sources: - - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-6.0 - packages: - # General build deps - - build-essential - - scons - - pkg-config - - # Linux/X11 build deps - - libx11-dev - - libxcursor-dev - - libxi-dev - - libxinerama-dev - - libxrandr-dev - - libgl1-mesa-dev - - libglu1-mesa-dev - - libasound2-dev - - libfreetype6-dev - - libssl-dev - - # For style checks. - - clang-format-6.0 - - libstdc++6 # >= 4.9 needed for clang-format-6.0 +before_install: + - if [ "$STATIC_CHECKS" = "yes" ]; then + unset SCONS_CACHE; + fi install: - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then