diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-26 19:29:31 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-26 19:34:17 +0200 |
| commit | 203fed204c5d473aa171796f7ba4fe082f391ba1 (patch) | |
| tree | a8ef6638bca272e4c927528f33428d20a919f693 /.travis.yml | |
| parent | 9a87fe37c19d36b6edf5fbc7ccb08528f25833a9 (diff) | |
| download | redot-engine-203fed204c5d473aa171796f7ba4fe082f391ba1.tar.gz | |
CI: Disable MinGW build on Travis and add AppVeyor badge
Now that AppVeyor handles testing Windows builds with MSVC,
we can skip the need to test against Travis' old MinGW toolchain
and have a faster CI process.
Also try building X11 binaries against system OpenSSL, should
speed up build.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 602152374a..a2c3417412 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ env: - GODOT_TARGET=osx - GODOT_TARGET=x11 #- GODOT_TARGET=android - - GODOT_TARGET=windows + #- GODOT_TARGET=windows matrix: include: @@ -66,13 +66,13 @@ addons: - libxrandr-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 + #- 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 # For style checks. - clang-format-3.9 @@ -92,5 +92,5 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX builtin_openssl=yes; + scons -j 2 platform=$GODOT_TARGET progress=no verbose=yes CXX=$CXX; fi |