Răsfoiți Sursa

Execute unit tests only on Xcode 8

kishikawa katsumi 9 ani în urmă
părinte
comite
f93dc12fd9
2 a modificat fișierele cu 34 adăugiri și 92 ștergeri
  1. 8 26
      .travis.yml
  2. 26 66
      Lib/Rakefile

+ 8 - 26
.travis.yml

@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode8
 cache:
   directories:
     - Lib/vendor/bundle
@@ -21,33 +22,14 @@ branches:
   only:
     - master
     - swift-2.3
-matrix:
-  include:
-    - osx_image: xcode8
-      env: ACTION=build
-    - osx_image: xcode8
-      env: ACTION='build:carthage'
-    - osx_image: xcode8
-      env: ACTION='test:iphonesimulator:debug coverage:coveralls'
-    - osx_image: xcode8
-      env: ACTION='test:iphonesimulator:release coverage:coveralls'
-    - osx_image: xcode8
-      env: ACTION='test:appletvsimulator coverage:coveralls'
-    - osx_image: xcode8
-      env: ACTION='test:macosx coverage:coveralls'
-    - osx_image: xcode7.3
-      env: ACTION=build
-    - osx_image: xcode7.3
-      env: ACTION='build:carthage'
-    - osx_image: xcode7.3
-      env: ACTION='test:iphonesimulator:debug coverage:coveralls'
-    - osx_image: xcode7.3
-      env: ACTION='test:iphonesimulator:release coverage:coveralls'
-    - osx_image: xcode7.3
-      env: ACTION='test:appletvsimulator coverage:coveralls'
-    - osx_image: xcode7.3
-      env: ACTION='test:macosx coverage:coveralls'
 env:
+  matrix:
+    - ACTION=build
+    - ACTION='build:carthage'
+    - ACTION='test:iphonesimulator:debug coverage:coveralls'
+    - ACTION='test:iphonesimulator:release coverage:coveralls'
+    - ACTION='test:appletvsimulator coverage:coveralls'
+    - ACTION='test:macosx coverage:coveralls'
   global:
     - LANG=en_US.UTF-8
     - LC_ALL=en_US.UTF-8

+ 26 - 66
Lib/Rakefile

@@ -1,55 +1,25 @@
 require 'xcjobs'
 
-xcode_version = `xcodebuild -version`.split("\n").first.scan(/\d+/).join('.')
-
-if xcode_version == '8.0'
-  def destinations(platform: 'iphonesimulator')
-    if platform == 'iphonesimulator'
-      [ 'name=iPhone 5,OS=10.0',
-        'name=iPhone 5s,OS=10.0',
-        'name=iPhone 6,OS=10.0',
-        'name=iPhone 6s Plus,OS=10.0',
-        'name=iPhone SE,OS=10.0',
-        'name=iPad Air 2,OS=10.0',
-        'name=iPad Pro (9.7 inch),OS=10.0',
-        'name=iPad Pro (12.9 inch),OS=10.0'
-      ]
-    elsif platform == 'watchsimulator'
-      [ 'name=Apple Watch - 38mm,OS=3.0',
-        'name=Apple Watch - 42mm,OS=3.0'
-      ]
-    elsif platform == 'appletvsimulator'
-      [ 'name=Apple TV 1080p,OS=10.0'
-      ]
-    else
-      []
-    end
-  end
-else
-  def destinations(platform: 'iphonesimulator')
-    if platform == 'iphonesimulator'
-      [ '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',
-        'name=iPhone 6,OS=9.1',
-        'name=iPhone 6 Plus,OS=9.1'
-      ]
-    elsif platform == 'watchsimulator'
-      [ 'name=Apple Watch - 38mm,OS=2.0',
-        'name=Apple Watch - 42mm,OS=2.0'
-      ]
-    elsif platform == 'appletvsimulator'
-      [ 'name=Apple TV 1080p,OS=9.0'
-      ]
-    else
-      []
-    end
+def destinations(platform: 'iphonesimulator')
+  if platform == 'iphonesimulator'
+    [ 'name=iPhone 5,OS=10.0',
+      'name=iPhone 5s,OS=10.0',
+      'name=iPhone 6,OS=10.0',
+      'name=iPhone 6s Plus,OS=10.0',
+      'name=iPhone SE,OS=10.0',
+      'name=iPad Air 2,OS=10.0',
+      'name=iPad Pro (9.7 inch),OS=10.0',
+      'name=iPad Pro (12.9 inch),OS=10.0'
+    ]
+  elsif platform == 'watchsimulator'
+    [ 'name=Apple Watch - 38mm,OS=3.0',
+      'name=Apple Watch - 42mm,OS=3.0'
+    ]
+  elsif platform == 'appletvsimulator'
+    [ 'name=Apple TV 1080p,OS=10.0'
+    ]
+  else
+    []
   end
 end
 
@@ -75,22 +45,12 @@ namespace :build do
       t.project = 'KeychainAccess'
       t.scheme = 'KeychainAccess'
       t.sdk = platform
-      if xcode_version == '8.0'
-        if platform == 'iphonesimulator'
-          t.add_destination('name=iPhone 6,OS=10.0')
-        elsif platform == 'watchsimulator'
-          t.add_destination('name=Apple Watch - 42mm,OS=3.0')
-        elsif platform == 'appletvsimulator'
-          t.add_destination('name=Apple TV 1080p,OS=10.0')
-        end
-      else
-        if platform == 'iphonesimulator'
-          t.add_destination('name=iPhone 6,OS=9.1')
-        elsif platform == 'watchsimulator'
-          t.add_destination('name=Apple Watch - 42mm,OS=2.0')
-        elsif platform == 'appletvsimulator'
-          t.add_destination('name=Apple TV 1080p,OS=9.0')
-        end
+      if platform == 'iphonesimulator'
+        t.add_destination('name=iPhone 6,OS=10.0')
+      elsif platform == 'watchsimulator'
+        t.add_destination('name=Apple Watch - 42mm,OS=3.0')
+      elsif platform == 'appletvsimulator'
+        t.add_destination('name=Apple TV 1080p,OS=10.0')
       end
       t.configuration = configuration
       t.build_dir = 'build'