ソースを参照

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 年 前
コミット
c3646224fc
2 ファイル変更6 行追加1 行削除
  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
     - 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

@@ -82,7 +82,7 @@ task :ci do
   end
   end
   # Define the build option string only when the override environment variable is given
   # 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_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']
   if ENV['XCODE']
     # xctool or xcodebuild
     # xctool or xcodebuild
     xcode_ci
     xcode_ci