Skip to content

Commit 9909109

Browse files
committed
Add Xcode 7 to Travis-CI.
1 parent 572f6d1 commit 9909109

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

.travis.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,36 @@ branches:
22
only:
33
- master
44
language: objective-c
5-
osx_image: xcode6.4
5+
os: osx
6+
matrix:
7+
include:
8+
- osx_image: xcode7
9+
env: TEST_TYPE=ios
10+
- osx_image: xcode7
11+
env: TEST_TYPE=osx
12+
- osx_image: xcode7
13+
env: TEST_TYPE=podspecs
14+
- osx_image: xcode6.4
15+
env: TEST_TYPE=ios
16+
- osx_image: xcode6.4
17+
env: TEST_TYPE=osx
18+
- osx_image: xcode6.4
19+
env: TEST_TYPE=deployment
20+
- osx_image: xcode6.4
21+
env: TEST_TYPE=starters
22+
- osx_image: xcode6.4
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:
1729
- bundle install
1830
script:
19-
- bundle exec rake test:$TEST_TYPE
31+
- |
32+
if [ -n "$TEST_TYPE" ]; then
33+
bundle exec rake test:$TEST_TYPE
34+
fi
2035
after_success:
2136
- |
2237
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then

Rakefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,9 +206,9 @@ namespace :test do
206206
t.workspace = 'Parse.xcworkspace'
207207

208208
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"']
209+
t.sdk = 'iphonesimulator'
210+
t.destinations = ['"platform=iOS Simulator,name=iPhone 4s"',
211+
'"platform=iOS Simulator,name=iPhone 6 Plus"']
212212
t.configuration = 'Test'
213213

214214
t.actions = [XCTask::BuildAction::TEST]
@@ -229,7 +229,7 @@ namespace :test do
229229
t.workspace = 'Parse.xcworkspace'
230230

231231
t.scheme = 'Parse-OSX'
232-
t.sdk = 'macosx10.10'
232+
t.sdk = 'macosx'
233233
t.destinations = ['arch=x86_64']
234234
t.configuration = 'Test'
235235

0 commit comments

Comments
 (0)