Browse Source

For Travis CI - clean up Rakefile, only download for DirectX CI build.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
f28d29cf2d
2 changed files with 1 additions and 6 deletions
  1. 0 5
      .travis.yml
  2. 1 1
      Rakefile

+ 0 - 5
.travis.yml

@@ -43,11 +43,6 @@ env:
     - WINDOWS=1 URHO3D_LIB_TYPE=SHARED URHO3D_64BIT=0 URHO3D_OPENGL=0
     - WINDOWS=1 URHO3D_LIB_TYPE=SHARED URHO3D_64BIT=0 URHO3D_OPENGL=0
 matrix:
 matrix:
   fast_finish: true
   fast_finish: true
-  allow_failures:
-    - env: WINDOWS=1 URHO3D_LIB_TYPE=STATIC URHO3D_OPENGL=0
-    - env: WINDOWS=1 URHO3D_LIB_TYPE=SHARED URHO3D_OPENGL=0
-    - env: WINDOWS=1 URHO3D_LIB_TYPE=STATIC URHO3D_64BIT=0 URHO3D_OPENGL=0
-    - env: WINDOWS=1 URHO3D_LIB_TYPE=SHARED URHO3D_64BIT=0 URHO3D_OPENGL=0
   include:
   include:
     - compiler: clang
     - compiler: clang
       env: LINUX=1 URHO3D_LIB_TYPE=STATIC
       env: LINUX=1 URHO3D_LIB_TYPE=STATIC

+ 1 - 1
Rakefile

@@ -276,7 +276,7 @@ def makefile_ci
   if ENV['WINDOWS']
   if ENV['WINDOWS']
     # MinGW package on Ubuntu 12.04 LTS does not come with d3dcompiler.h file which is required by our CI build with URHO3D_OPENGL=0.
     # MinGW package on Ubuntu 12.04 LTS does not come with d3dcompiler.h file which is required by our CI build with URHO3D_OPENGL=0.
     # Temporarily workaround the problem by downloading the missing header from Ubuntu 14.04 LTS source package.
     # Temporarily workaround the problem by downloading the missing header from Ubuntu 14.04 LTS source package.
-    if ENV['CI'] then
+    if ENV['URHO3D_OPENGL'] && ENV['CI'] then
       system "sudo wget -P $(echo |$MINGW_PREFIX-gcc -v -E - 2>&1 |grep -B 1 'End of search list' |head -1) http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/mingw-w64/trusty/download/package-import%40ubuntu.com-20130624192537-vzn12bb7qd5w3iy8/d3dcompiler.h-20120402093420-bk10a737hzitlkgj-65/d3dcompiler.h" or abort 'Failed to download d3dcompiler.h header'
       system "sudo wget -P $(echo |$MINGW_PREFIX-gcc -v -E - 2>&1 |grep -B 1 'End of search list' |head -1) http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/mingw-w64/trusty/download/package-import%40ubuntu.com-20130624192537-vzn12bb7qd5w3iy8/d3dcompiler.h-20120402093420-bk10a737hzitlkgj-65/d3dcompiler.h" or abort 'Failed to download d3dcompiler.h header'
     end
     end
     # LuaJIT on MinGW build is not possible on Ubuntu 12.04 LTS as its GCC cross-compiler version is too old. Fallback to use Lua library instead.
     # LuaJIT on MinGW build is not possible on Ubuntu 12.04 LTS as its GCC cross-compiler version is too old. Fallback to use Lua library instead.