Browse Source

Merge pull request #121 from kishikawakatsumi/circleci-xcode7

Fix failing tests on CircleCI with Xcode 7
kishikawa katsumi 10 years ago
parent
commit
f9cd37938f
2 changed files with 17 additions and 11 deletions
  1. 16 10
      Lib/Rakefile
  2. 1 1
      circle.yml

+ 16 - 10
Lib/Rakefile

@@ -1,16 +1,22 @@
 require 'xcjobs'
 require 'xcjobs'
 
 
 def destinations
 def destinations
-  [ 'name=iPad 2,OS=8.1',
-    'name=iPad Air,OS=8.1',
-    'name=iPhone 4s,OS=8.1',
-    'name=iPhone 5,OS=8.1',
-    'name=iPhone 5s,OS=8.1',
-    'name=iPhone 6,OS=8.1',
-    'name=iPhone 6 Plus,OS=8.1',
-    'name=iPhone 6,OS=9.0',
-    'name=iPhone 6 Plus,OS=9.0'
-  ]
+  if ENV['CIRCLECI']
+      [ 'name=iPhone 6,OS=9.0',
+        'name=iPhone 6 Plus,OS=9.0'
+      ]
+  else
+    [ 'name=iPad 2,OS=8.1',
+      'name=iPad Air,OS=8.1',
+      'name=iPhone 4s,OS=8.1',
+      'name=iPhone 5,OS=8.1',
+      'name=iPhone 5s,OS=8.1',
+      'name=iPhone 6,OS=8.1',
+      'name=iPhone 6 Plus,OS=8.1',
+      'name=iPhone 6,OS=9.0',
+      'name=iPhone 6 Plus,OS=9.0'
+    ]
+  end
 end
 end
 
 
 XCJobs::Build.new('build:simulator') do |t|
 XCJobs::Build.new('build:simulator') do |t|

+ 1 - 1
circle.yml

@@ -1,6 +1,6 @@
 machine:
 machine:
   xcode:
   xcode:
-    version: "6.3.1"
+    version: "7.0"
     
     
 dependencies:
 dependencies:
   override:
   override: