Skip to content

Commit d428055

Browse files
committed
Merge branch 'master' into greenkeeper/eslint-config-prettier-2.7.0
* master: remove package-lock add yarn lockfile install yarn on osx update travis to call yarn disable npm lockfile generation babel-jest has a peerDependency of babel-core react-native-maps has a peerDependency of prop-types
2 parents 5b21f14 + c8a54bf commit d428055

File tree

5 files changed

+5634
-8009
lines changed

5 files changed

+5634
-8009
lines changed

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
save-exact=true
2+
package-lock=false

.travis.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
before_install:
6565
- npm install -g coveralls
6666
install:
67-
- npm install || npm install
67+
- yarn || yarn
6868
before_script:
6969
- echo "loglevel=silent" >> .npmrc
7070
- mkdir -p logs/
@@ -99,7 +99,7 @@ jobs:
9999
env: [GH_PAGES=yes]
100100
before_install: skip
101101
install:
102-
- npm install || npm install
102+
- yarn || yarn
103103
before_script: skip
104104
script: npm run bundle-data
105105
deploy:
@@ -164,11 +164,14 @@ before_install:
164164
- nvm install "$TRAVIS_NODE_VERSION"
165165
- nvm use "$TRAVIS_NODE_VERSION"
166166
- echo "node -v is now $(node -v)"
167+
168+
# travis doesn't install yarn automatically on osx
169+
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew install yarn --without-node; fi
167170

168171

169172
install:
170173
# install packages (if the first fails, try once more)
171-
- npm install || npm install
174+
- yarn || yarn
172175

173176
# install fastlane (if at first you don't succeed, try once more)
174177
- bundle install || bundle install

0 commit comments

Comments
 (0)