Browse Source

For Travis CI - temporarily allowed the new CI builds to fail.
The MinGW packages from Ubuntu 12.04 LTS are too old to pull this off.

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

+ 5 - 0
.travis.yml

@@ -43,6 +43,11 @@ env:
     - WINDOWS=1 URHO3D_LIB_TYPE=SHARED URHO3D_64BIT=0 URHO3D_OPENGL=0
 matrix:
   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:
     - compiler: clang
       env: LINUX=1 URHO3D_LIB_TYPE=STATIC

+ 1 - 1
Rakefile

@@ -82,7 +82,7 @@ task :ci do
   end
   # Define the build option string only when the override environment variable is given
   $build_options = "-DURHO3D_64BIT=#{ENV['URHO3D_64BIT']}" if ENV['URHO3D_64BIT']
-  $build_options = " -DURHO3D_OPENGL=#{ENV['URHO3D_OPENGL']}" if ENV['URHO3D_OPENGL']
+  $build_options = "#{$build_options} -DURHO3D_OPENGL=#{ENV['URHO3D_OPENGL']}" if ENV['URHO3D_OPENGL']
   if ENV['XCODE']
     # xctool or xcodebuild
     xcode_ci