Skip to content

Commit 3ed1202

Browse files
committed
Add Xcode 7 to Travis-CI.
1 parent 8b2b57b commit 3ed1202

File tree

2 files changed

+35
-15
lines changed

2 files changed

+35
-15
lines changed

.travis.yml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,39 @@ branches:
22
only:
33
- master
44
language: objective-c
5-
osx_image: xcode6.4
5+
os: osx
6+
matrix:
7+
include:
8+
- osx_image: xcode6.4
9+
env: TEST_TYPE=ios
10+
- osx_image: xcode6.4
11+
env: TEST_TYPE=osx
12+
- osx_image: xcode6.4
13+
env: TEST_TYPE=deployment
14+
- osx_image: xcode6.4
15+
env: TEST_TYPE=starters
16+
- osx_image: xcode6.4
17+
env: TEST_TYPE=podspecs
18+
- osx_image: xcode7
19+
env: TEST_TYPE=ios
20+
- osx_image: xcode7
21+
env: TEST_TYPE=osx
22+
- osx_image: xcode7
23+
env: TEST_TYPE=podspecs
624
env:
725
global:
826
- LC_CTYPE=en_US.UTF-8
927
- LANG=en_US.UTF-8
10-
matrix:
11-
- TEST_TYPE=ios
12-
- TEST_TYPE=osx
13-
- TEST_TYPE=deployment
14-
- TEST_TYPE=starters
15-
- TEST_TYPE=podspecs
1628
install:
17-
- bundle install
29+
- |
30+
if [ -n "$TEST_TYPE" ]; then
31+
bundle install
32+
fi
1833
script:
19-
- bundle exec rake test:$TEST_TYPE
34+
- |
35+
if [ -n "$TEST_TYPE" ]; then
36+
bundle exec rake test:$TEST_TYPE
37+
fi
2038
after_success:
2139
- |
2240
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then

Rakefile

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,16 @@ end
200200

201201
namespace :test do
202202
desc 'Run iOS Tests'
203-
task :ios do |_|
203+
task :ios, :sdk_version do |_, args|
204+
sdk_version = args[:sdk_version] || '8.4'
204205
task = XCTask::BuildTask.new do |t|
205206
t.directory = script_folder
206207
t.workspace = 'Parse.xcworkspace'
207208

208209
t.scheme = 'Parse-iOS'
209-
t.sdk = 'iphonesimulator8.4'
210-
t.destinations = ['"platform=iOS Simulator,OS=8.4,name=iPhone 4s"',
211-
'"platform=iOS Simulator,OS=8.4,name=iPhone 6 Plus"']
210+
t.sdk = "iphonesimulator#{sdk_version}"
211+
t.destinations = ["\"platform=iOS Simulator,OS=#{sdk_version},name=iPhone 4s\"",
212+
"\"platform=iOS Simulator,OS=#{sdk_version},name=iPhone 6 Plus\"",]
212213
t.configuration = 'Test'
213214

214215
t.actions = [XCTask::BuildAction::TEST]
@@ -223,13 +224,14 @@ namespace :test do
223224
end
224225

225226
desc 'Run OS X Tests'
226-
task :osx do |_|
227+
task :osx, :sdk_version do |_, args|
228+
sdk_version = args[:sdk_version] || '10.10'
227229
task = XCTask::BuildTask.new do |t|
228230
t.directory = script_folder
229231
t.workspace = 'Parse.xcworkspace'
230232

231233
t.scheme = 'Parse-OSX'
232-
t.sdk = 'macosx10.10'
234+
t.sdk = "macosx#{sdk_version}"
233235
t.destinations = ['arch=x86_64']
234236
t.configuration = 'Test'
235237

0 commit comments

Comments
 (0)