Skip to content

Commit

Permalink
adding yarn lock file and removing it from git ignore (webpack#3648)
Browse files Browse the repository at this point in the history
* adding yarn lock file and removing it from git ignore
* travis will now run yarn by default that it sees the lock file
  • Loading branch information
elodszopos authored and TheLarkInn committed Dec 30, 2016
1 parent 7d17746 commit bfcc594
Show file tree
Hide file tree
Showing 4 changed files with 4,070 additions and 3 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@
.DS_Store
*.log
.idea
yarn.lock
.vscode
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/travis-install.sh
Original file line number Diff line number Diff line change
@@ -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;

Loading

0 comments on commit bfcc594

Please sign in to comment.