From 1ac61b744a731d8d2cacfad4babcc5a7e7547b55 Mon Sep 17 00:00:00 2001 From: Juan David Dominguez and Tim Jarratt Date: Fri, 10 Jul 2015 14:51:30 -0700 Subject: [PATCH] Update Travis CI build matrix - Drop iOS 7.0.3 runtime - Use Xcode 6.4 for testing the iOS 7.1 runtime - Use Xcode 7 for testing the iOS 8.4 and 9.0 runtimes - Run the UI specs with the Debug configuration so symbolication works properly --- .travis.yml | 26 ++++++++++++++------------ Rakefile | 5 +++-- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd688296..e2ccafd2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,20 +1,22 @@ language: objective-c +osx_image: xcode7 -env: - matrix: - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="7.0.3" TASK="rake ci" - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="7.1" TASK="rake ci" - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake ci" +matrix: + include: + - osx_image: xcode6.4 + env: CEDAR_SDK_VERSION="8.4" CEDAR_SDK_RUNTIME_VERSION="7.1" TASK="rake ci" + - env: CEDAR_SDK_VERSION="9.0" CEDAR_SDK_RUNTIME_VERSION="8.4" TASK="rake ci" + - env: CEDAR_SDK_VERSION="9.0" CEDAR_SDK_RUNTIME_VERSION="9.0" TASK="rake ci" - # Analyze takes too long -- vary on runtime SDK - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:specs:analyze" - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:uispecs:analyze" - - CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:focused_specs:analyze" + # Analyze takes too long -- vary on runtime SDK + - env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:specs:analyze" + - env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:uispecs:analyze" + - env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:focused_specs:analyze" - - TASK="./install.sh" - - TASK="./installCodeSnippetsAndTemplates" + - env: TASK="./install.sh" + - env: TASK="./installCodeSnippetsAndTemplates" -before_install: brew update +before_install: brew update; brew update install: - bundle install - brew install ios-sim diff --git a/Rakefile b/Rakefile index 11baccfe..f536bb50 100644 --- a/Rakefile +++ b/Rakefile @@ -145,9 +145,10 @@ class Xcode args += " -target #{options[:target].inspect}" if options[:target] args += " -sdk #{options[:sdk].inspect}" if options[:sdk] args += " -scheme #{options[:scheme].inspect}" if options[:scheme] + args += " -configuration #{options[:configuration] || CONFIGURATION}" Shell.fold "build.#{options[:scheme] || options[:target]}" do - Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj -configuration #{CONFIGURATION} SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile) + Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile) end end @@ -334,7 +335,7 @@ namespace :suites do desc "Build UI specs" task :build do - Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', logfile: "uispecs.build.log") + Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', configuration: "Debug", logfile: "uispecs.build.log") end desc "Run UI specs"