adding yarn lock file and removing it from git ignore (webpack#3648)

elodszopos · TheLarkInn · commit bfcc5942bbd2 · 2016-12-30T10:39:02.000-06:00
* adding yarn lock file and removing it from git ignore
* travis will now run yarn by default that it sees the lock file
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@
 .DS_Store
 *.log
 .idea
-yarn.lock
 .vscode
diff --git a/.travis.yml b/.travis.yml
@@ -36,7 +36,7 @@ matrix:
 script: npm run travis:$JOB_PART
 
 before_install: if [[ `npm -v` != 3* ]]; then npm i -g npm@3; fi
-install:
+before_script:
   - bash ./ci/travis-install.sh
 after_success:
   - cat ./coverage/lcov.info | node_modules/.bin/coveralls --verbose
diff --git a/ci/travis-install.sh b/ci/travis-install.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 set -ev
 
-npm install yarn -g && yarn install && yarn link || true && yarn link webpack;
+yarn link || true && yarn link webpack;
 
diff --git a/yarn.lock b/yarn.lock
