Skip to content

Commit e92110b

Browse files
tjarrattBrian Croom
authored andcommitted
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
1 parent 7028700 commit e92110b

File tree

2 files changed

+25
-19
lines changed

2 files changed

+25
-19
lines changed

.travis.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
language: objective-c
2+
osx_image: xcode7
23

3-
env:
4-
matrix:
5-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="7.0.3" TASK="rake ci"
6-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="7.1" TASK="rake ci"
7-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake ci"
4+
matrix:
5+
include:
6+
- osx_image: xcode6.4
7+
env: CEDAR_SDK_VERSION="8.4" CEDAR_SDK_RUNTIME_VERSION="7.1" TASK="rake ci"
8+
- env: CEDAR_SDK_VERSION="9.0" CEDAR_SDK_RUNTIME_VERSION="8.4" TASK="rake ci"
9+
- env: CEDAR_SDK_VERSION="9.0" CEDAR_SDK_RUNTIME_VERSION="9.0" TASK="rake ci"
810

9-
# Analyze takes too long -- vary on runtime SDK
10-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:specs:analyze"
11-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:uispecs:analyze"
12-
- CEDAR_SDK_VERSION="8.1" CEDAR_SDK_RUNTIME_VERSION="8.1" TASK="rake suites:focused_specs:analyze"
11+
# Analyze takes too long -- vary on runtime SDK
12+
- env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:specs:analyze"
13+
- env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:uispecs:analyze"
14+
- env: CEDAR_SDK_VERSION="9.0" TASK="rake suites:focused_specs:analyze"
1315

14-
- TASK="./install.sh"
15-
- TASK="./installCodeSnippetsAndTemplates"
16+
- env: TASK="./install.sh"
17+
- env: TASK="./installCodeSnippetsAndTemplates"
1618

17-
before_install: brew update
19+
before_install: brew update; brew update
1820
install:
1921
- bundle install
2022
- brew install ios-sim

Rakefile

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ class Xcode
117117
`xcode-select -print-path`.strip
118118
end
119119

120-
def self.build_dir(effective_platform_name = "")
121-
File.join(BUILD_DIR, CONFIGURATION + effective_platform_name)
120+
def self.build_dir(effective_platform_name = "", configuration = nil)
121+
File.join(BUILD_DIR, (configuration || CONFIGURATION) + effective_platform_name)
122122
end
123123

124124
def self.sdk_dir_for_version(version)
@@ -145,9 +145,10 @@ class Xcode
145145
args += " -target #{options[:target].inspect}" if options[:target]
146146
args += " -sdk #{options[:sdk].inspect}" if options[:sdk]
147147
args += " -scheme #{options[:scheme].inspect}" if options[:scheme]
148+
args += " -configuration #{options[:configuration] || CONFIGURATION}"
148149

149150
Shell.fold "build.#{options[:scheme] || options[:target]}" do
150-
Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj -configuration #{CONFIGURATION} SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile)
151+
Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile)
151152
end
152153
end
153154

@@ -210,6 +211,9 @@ class Simulator
210211
begin
211212
kill # ensure simulator is not currently running
212213
Shell.run "ios-sim launch #{File.join(app_dir, "#{app_name}.app").inspect} --devicetypeid \"com.apple.CoreSimulator.SimDeviceType.iPhone-5s, #{SDK_RUNTIME_VERSION}\" --verbose --stdout build/uispecs.spec.log"
214+
puts "** cat: **"
215+
system("cat build/uispecs.spec.log")
216+
puts "**done**"
213217
Shell.run "grep -q ', 0 failures' build/uispecs.spec.log", logfile
214218
rescue
215219
retry_count += 1
@@ -334,7 +338,7 @@ namespace :suites do
334338

335339
desc "Build UI specs"
336340
task :build do
337-
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', logfile: "uispecs.build.log")
341+
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', configuration: "Debug", logfile: "uispecs.build.log")
338342
end
339343

340344
desc "Run UI specs"
@@ -345,7 +349,7 @@ namespace :suites do
345349
}
346350

347351
Shell.with_env(env_vars) do
348-
Simulator.launch(Xcode.build_dir("-iphonesimulator"), UI_SPECS_TARGET_NAME, "uispecs.run.log")
352+
Simulator.launch(Xcode.build_dir("-iphonesimulator", "Debug"), UI_SPECS_TARGET_NAME, "uispecs.run.log")
349353
end
350354
end
351355
end
@@ -416,7 +420,7 @@ namespace :suites do
416420

417421
desc "Build iOS dynamic framework specs"
418422
task :build do
419-
Xcode.build(target: IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', logfile: "frameworks.ios.dynamic.specs.build.log")
423+
Xcode.build(target: IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', configuration: "Debug", logfile: "frameworks.ios.dynamic.specs.build.log")
420424
end
421425

422426
desc "Runs iOS dynamic framework specs"
@@ -427,7 +431,7 @@ namespace :suites do
427431
}
428432

429433
Shell.with_env(env_vars) do
430-
Simulator.launch(Xcode.build_dir("-iphonesimulator"), IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, "frameworks.ios.dynamic.specs.run.log")
434+
Simulator.launch(Xcode.build_dir("-iphonesimulator", "Debug"), IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, "frameworks.ios.dynamic.specs.run.log")
431435
end
432436
end
433437
end

0 commit comments

Comments
 (0)