Skip to content

Commit 8ce8aca

Browse files
tjarrattTim Jarratt
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 3d0d8e3 commit 8ce8aca

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

.travis.yml

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
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
23+
- ios-sim showsdks
24+
- ios-sim showdevicetypes
2125

2226
script:
2327
# run a printer task to keep travis from terminating static analysis

scripts/rake/helpers/xcode.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ def self.developer_dir
99
`xcode-select -print-path`.strip
1010
end
1111

12-
def self.build_dir(effective_platform_name = "")
13-
File.join(BUILD_DIR, CONFIGURATION + effective_platform_name)
12+
def self.build_dir(effective_platform_name = "", configuration = CONFIGURATION)
13+
File.join(BUILD_DIR, configuration + effective_platform_name)
1414
end
1515

1616
def self.sdk_dir_for_version(version)
@@ -41,9 +41,10 @@ def self.build(options = nil)
4141
args += " -target #{options[:target].inspect}" if options[:target]
4242
args += " -sdk #{options[:sdk].inspect}" if options[:sdk]
4343
args += " -scheme #{options[:scheme].inspect}" if options[:scheme]
44+
args += " -configuration #{options[:configuration] || CONFIGURATION}"
4445

4546
Shell.fold "build.#{options[:scheme] || options[:target]}" do
46-
Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj -configuration #{CONFIGURATION} SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile)
47+
Shell.run(%Q(xcodebuild -project #{PROJECT_NAME}.xcodeproj SYMROOT=#{BUILD_DIR.inspect} clean build #{args}), logfile)
4748
end
4849
end
4950

scripts/rake/tasks/spec_suites.rb

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
desc "Build UI specs"
4343
task :build do
44-
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', logfile: "uispecs.build.log")
44+
Xcode.build(target: UI_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386', configuration: "Debug", logfile: "uispecs.build.log")
4545
end
4646

4747
desc "Run UI specs"
@@ -52,7 +52,7 @@
5252
}
5353

5454
Shell.with_env(env_vars) do
55-
Simulator.launch(Xcode.build_dir("-iphonesimulator"), UI_SPECS_TARGET_NAME, Xcode.build_dir("-uispecs.run.log"))
55+
Simulator.launch(Xcode.build_dir("-iphonesimulator", "Debug"), UI_SPECS_TARGET_NAME, Xcode.build_dir("-uispecs.run.log"))
5656
end
5757
end
5858
end
@@ -123,7 +123,11 @@
123123

124124
desc "Build iOS dynamic framework specs"
125125
task :build do
126-
Xcode.build(target: IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, sdk: "iphonesimulator#{SDK_VERSION}", args: 'ARCHS=i386 '+Xcode.swift_build_settings, logfile: "frameworks.ios.dynamic.specs.build.log")
126+
Xcode.build(target: IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME,
127+
sdk: "iphonesimulator#{SDK_VERSION}",
128+
args: 'ARCHS=i386 '+Xcode.swift_build_settings,
129+
configuration: "Debug",
130+
logfile: "frameworks.ios.dynamic.specs.build.log")
127131
end
128132

129133
desc "Runs iOS dynamic framework specs"
@@ -134,7 +138,7 @@
134138
}
135139

136140
Shell.with_env(env_vars) do
137-
Simulator.launch(Xcode.build_dir("-iphonesimulator"), IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, Xcode.build_dir("-frameworks.ios.dynamic.specs.run.log"))
141+
Simulator.launch(Xcode.build_dir("-iphonesimulator", "Debug"), IOS_DYNAMIC_FRAMEWORK_SPECS_TARGET_NAME, Xcode.build_dir("-frameworks.ios.dynamic.specs.run.log"))
138142
end
139143
end
140144
end

0 commit comments

Comments
 (0)