Merge branch 'master' into development

* master:
  change travis config
This commit is contained in:
Erik Little 2016-07-21 10:42:30 -04:00
commit b65b63a9f0
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320

View File

@ -2,12 +2,9 @@ language: objective-c
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
xcode_scheme: SocketIO-iOS xcode_scheme: SocketIO-iOS
osx_image: xcode7.3 osx_image: xcode7.3
before_install: branches:
- cd Socket.IO-Test-Server/ only:
- npm install - master
- cd .. - development
install: node Socket.IO-Test-Server/main.js & install: node Socket.IO-Test-Server/main.js &
script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize
cache:
directories:
- Socket.IO-Test-Server/node_modules