diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-03-07 13:04:29 +0100 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-03-07 13:04:29 +0100 |
| commit | 17e92a896e0ced75e868517687cf900239afa010 (patch) | |
| tree | f773ff960ce15629cd37f572c2499022ec1606b3 | |
| parent | 973f7d56f3a973539da0ec6a7109a78f65e0d70d (diff) | |
| parent | 1f83ae9b5abd03fe4d0943da2d7a1f06151e116c (diff) | |
Merge pull request #3974 from Marqin/master
migrate to container-based Travis CI
| -rw-r--r-- | .travis.yml | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 032e6aa0b8..11dcdf447c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: cpp -sudo: required -dist: trusty +sudo: false compiler: - gcc @@ -41,10 +40,33 @@ matrix: - compiler: clang env: GODOT_TARGET=x11 +addons: + apt: + packages: + - build-essential + - scons + - pkg-config + - libx11-dev + - libxcursor-dev + - libasound2-dev + - libfreetype6-dev + - libgl1-mesa-dev + - libglu1-mesa-dev + - libssl-dev + - libxinerama-dev + - libudev-dev + + # For cross-compiling to Windows. + - binutils-mingw-w64-i686 + - binutils-mingw-w64-x86-64 + - gcc-mingw-w64-i686 + - gcc-mingw-w64-x86-64 + - g++-mingw-w64-i686 + - g++-mingw-w64-x86-64 + - mingw-w64 + before_script: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y scons pkg-config libx11-dev libxcursor-dev build-essential libasound2-dev libfreetype6-dev libgl1-mesa-dev libglu-dev libssl-dev libxinerama-dev libudev-dev; fi - - if [ "$TRAVIS_OS_NAME" = "linux" ] && [ "$GODOT_TARGET" = "windows" ]; then sudo apt-get update -qq; sudo apt-get install -y mingw32 mingw-w64; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; brew install scons; fi - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$GODOT_TARGET" = "android" ]; then brew update; brew install android-sdk android-ndk; export ANDROID_HOME=/usr/local/opt/android-sdk; export ANDROID_NDK_ROOT=/usr/local/opt/android-ndk; fi |