Skip to content

Commit 1ac61b7

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 1ac61b7

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
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: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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

@@ -334,7 +335,7 @@ namespace :suites do
334335

335336
desc "Build UI specs"
336337
task :build do
337-
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', logfile: "uispecs.build.log")
338+
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', configuration: "Debug", logfile: "uispecs.build.log")
338339
end
339340

340341
desc "Run UI specs"

0 commit comments

Comments
 (0)