Merge pull request #121 from kishikawakatsumi/circleci-xcode7

Fix failing tests on CircleCI with Xcode 7
kishikawakatsumi · Oct 4, 2015 · f9cd379 · f9cd379
2 parents a3e5490 + 4ba83f8
commit f9cd379
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/Lib/Rakefile b/Lib/Rakefile
@@ -1,16 +1,22 @@
 require 'xcjobs'
 
 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
 
 XCJobs::Build.new('build:simulator') do |t|

diff --git a/circle.yml b/circle.yml
@@ -1,6 +1,6 @@
 machine:
   xcode:
-    version: "6.3.1"
+    version: "7.0"
 
 dependencies:
   override: