Merge branch 'iojs-tests' of https://github.com/ide/react-native into Update_Wed_1_Jul
Conflicts: package.json
This commit is contained in:
commit
d0cb80c072
|
@ -15,13 +15,13 @@ install:
|
|||
- cp $(brew --prefix nvm)/nvm-exec .nvm/
|
||||
- export NVM_DIR=.nvm
|
||||
- source $(brew --prefix nvm)/nvm.sh
|
||||
- nvm install v0.10
|
||||
- nvm install iojs-v2
|
||||
- npm config set spin=false
|
||||
- npm install
|
||||
|
||||
script:
|
||||
- |
|
||||
nvm use v0.10
|
||||
nvm use iojs-v2
|
||||
|
||||
if [ "$TEST_TYPE" = objc ]
|
||||
then
|
||||
|
|
|
@ -72,7 +72,7 @@
|
|||
"yargs": "1.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"jest-cli": "git://github.com/facebook/jest#0.5.x",
|
||||
"jest-cli": "facebook/jest#0.5.x",
|
||||
"babel-eslint": "3.1.5",
|
||||
"eslint": "0.21.2",
|
||||
"eslint-plugin-react": "2.3.0"
|
||||
|
|
Loading…
Reference in New Issue