Only run tests for latest SDKs; Tag 6.3.3

Really doing it for all other variants is gratitous. Travis doesn't actually provide all tvOS and watchOS (older SDK) simulators like they claim.
mxcl · Jun 17, 2018 · 264ba1f · 264ba1f
1 parent b96bb7b
commit 264ba1f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -20,15 +20,16 @@ matrix:
     - {osx_image: xcode9.2,     env: 'SWFT=4.0  PLAT=macOS    DST="arch=x86_64"',                    os: osx, language: objective-c}
     - {osx_image: xcode9.2,     env: 'SWFT=4.0  PLAT=watchOS  DST="OS=4.2,name=Apple Watch - 38mm"', os: osx, language: objective-c}
 
-    - {osx_image: xcode9.4,     env: 'SWFT=4.0  PLAT=iOS      DST="OS=8.4,name=iPhone 4s"',          os: osx, language: objective-c}    
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=9.3,name=iPhone SE"',          os: osx, language: objective-c}
+    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=8.4,name=iPhone 4s"',          os: osx, language: objective-c}    
+    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=9.3,name=iPhone 5s"',          os: osx, language: objective-c}
     - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=10.3.1,name=iPhone SE"',       os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=11.4,name=iPhone SE"',         os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=tvOS     DST="OS=10.2,name=Apple TV 1080p"',    os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=tvOS     DST="OS=11.4,name=Apple TV"',          os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=macOS    DST="arch=x86_64"',                    os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=watchOS  DST="OS=2.2,name=Apple Watch - 38mm"', os: osx, language: objective-c}
-    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=watchOS  DST="OS=3.2,name=Apple Watch - 38mm"', os: osx, language: objective-c}
+    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=iOS      DST="OS=11.4,name=iPhone SE" TEST=1',  os: osx, language: objective-c}
+    - {osx_image: xcode9.3,     env: 'SWFT=4.1  PLAT=tvOS     DST="OS=9.2,name=Apple TV 1080p"',     os: osx, language: objective-c}
+    - {osx_image: xcode9.3,     env: 'SWFT=4.1  PLAT=tvOS     DST="OS=10.2,name=Apple TV 1080p"',    os: osx, language: objective-c}
+    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=tvOS     DST="OS=11.4,name=Apple TV" TEST=1',   os: osx, language: objective-c}
+    - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=macOS    DST="arch=x86_64" TEST=1',             os: osx, language: objective-c}
+    - {osx_image: xcode9.3,     env: 'SWFT=4.1  PLAT=watchOS  DST="OS=2.2,name=Apple Watch - 38mm"', os: osx, language: objective-c}
+    - {osx_image: xcode9.3,     env: 'SWFT=4.1  PLAT=watchOS  DST="OS=3.2,name=Apple Watch - 38mm"', os: osx, language: objective-c}
     - {osx_image: xcode9.4,     env: 'SWFT=4.1  PLAT=watchOS  DST="OS=4.3,name=Apple Watch - 38mm"', os: osx, language: objective-c}
 
     - {os: linux, dist: trusty, sudo: required, language: generic, env: 'SWFT=3'}
@@ -42,18 +43,16 @@ before_install:
 install:
   case $PLAT in
   iOS|tvOS|macOS|watchOS)
-    xcodebuild -scheme PromiseKit SWIFT_VERSION=$SWFT -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build;;
+    xcodebuild -scheme PromiseKit -target PromiseKit SWIFT_VERSION=$SWFT -quiet -destination "$DST" SWIFT_TREAT_WARNINGS_AS_ERRORS=YES build;;
   *)
     swift build;;
   esac
 script:
   case $PLAT in
-  iOS|tvOS)
-    osascript -e "tell application \"Simulator\" to quit";
-    DST=$(echo "$DST" | awk -F',' '{printf "%s", $2}');
-    xcodebuild -scheme PromiseKit -destination "$DST" test -enableCodeCoverage YES;;
-  macOS)
-    xcodebuild -scheme PromiseKit -destination "$DST" test -enableCodeCoverage YES;;
+  iOS|tvOS|macOS)
+    if [[ TEST == "1" ]]; then
+      xcodebuild -scheme PromiseKit -destination "$DST" test -enableCodeCoverage YES;
+    fi;;
   watchOS)
     ;;
   *)

diff --git a/PromiseKit.xcodeproj/project.pbxproj b/PromiseKit.xcodeproj/project.pbxproj
@@ -925,7 +925,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.3.2;
+				CURRENT_PROJECT_VERSION = 6.3.3;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
@@ -986,7 +986,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6.3.2;
+				CURRENT_PROJECT_VERSION = 6.3.3;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;