Travis: Make dependencies follow the matrix requirements

Also make the coverity addon only applied to the static checks build job.

(cherry picked from commit c58f73fd35)
This commit is contained in:
Rémi Verschelde 2018-06-15 10:13:52 +02:00 committed by Hein-Pieter van Braam
parent ba3406fffe
commit ef67ef3155
1 changed files with 37 additions and 26 deletions

View File

@ -20,53 +20,64 @@ matrix:
- env: STATIC_CHECKS=yes - env: STATIC_CHECKS=yes
os: linux os: linux
compiler: gcc 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 - env: GODOT_TARGET=x11 TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-gcc
os: linux os: linux
compiler: gcc 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 - env: GODOT_TARGET=x11 TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
os: linux os: linux
compiler: clang compiler: clang
addons:
apt:
packages:
- *linux_deps
- env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang - env: GODOT_TARGET=android TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
os: linux os: linux
compiler: clang compiler: clang
- env: GODOT_TARGET=osx TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-clang - env: GODOT_TARGET=osx TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-clang
os: osx os: osx
osx_image: xcode9.3 osx_image: xcode9.3
compiler: clang compiler: clang
- env: GODOT_TARGET=iphone TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang - env: GODOT_TARGET=iphone TOOLS=no CACHE_NAME=${GODOT_TARGET}-clang
os: osx os: osx
osx_image: xcode9.3 osx_image: xcode9.3
compiler: clang compiler: clang
- env: GODOT_TARGET=server TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-gcc - env: GODOT_TARGET=server TOOLS=yes CACHE_NAME=${GODOT_TARGET}-tools-gcc
os: linux os: linux
compiler: gcc compiler: gcc
addons: addons:
apt: apt:
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-trusty-6.0
packages: packages:
# General build deps - *linux_deps
- build-essential
- scons
- pkg-config
# Linux/X11 build deps before_install:
- libx11-dev - if [ "$STATIC_CHECKS" = "yes" ]; then
- libxcursor-dev unset SCONS_CACHE;
- libxi-dev fi
- 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
install: install:
- if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "android" ]; then