File tree Expand file tree Collapse file tree 2 files changed +27
-12
lines changed Expand file tree Collapse file tree 2 files changed +27
-12
lines changed Original file line number Diff line number Diff line change @@ -2,21 +2,36 @@ branches:
2
2
only :
3
3
- master
4
4
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
6
24
env :
7
25
global :
8
26
- LC_CTYPE=en_US.UTF-8
9
27
- 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
16
28
install :
17
29
- bundle install
18
30
script :
19
- - bundle exec rake test:$TEST_TYPE
31
+ - |
32
+ if [ -n "$TEST_TYPE" ]; then
33
+ bundle exec rake test:$TEST_TYPE
34
+ fi
20
35
after_success :
21
36
- |
22
37
if [ "$TEST_TYPE" = "ios" ] || [ "$TEST_TYPE" = "osx" ]; then
Original file line number Diff line number Diff line change @@ -206,9 +206,9 @@ namespace :test do
206
206
t . workspace = 'Parse.xcworkspace'
207
207
208
208
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"' ]
212
212
t . configuration = 'Test'
213
213
214
214
t . actions = [ XCTask ::BuildAction ::TEST ]
@@ -229,7 +229,7 @@ namespace :test do
229
229
t . workspace = 'Parse.xcworkspace'
230
230
231
231
t . scheme = 'Parse-OSX'
232
- t . sdk = 'macosx10.10 '
232
+ t . sdk = 'macosx '
233
233
t . destinations = [ 'arch=x86_64' ]
234
234
t . configuration = 'Test'
235
235
You can’t perform that action at this time.
0 commit comments