Skip to content

Commit a4ad44c

Browse files
authored
fix(travis): fix yarn link and yarn link webpack commands (webpack#3191)
* fix(travis): trying alternate logic for linking packages for yarn * fix(travis): removing msie flag for appveyor for yarn install * Update .travis.yml Update logic for link command * Update appveyor.yml Removed logic from AppVeyor since directory is not cached, it will be fresh install and link every time. * chore(beautify): fixed beauitfy errors not caught from previous PR * chore(yarn): remove yarn.lock * chore(gitignore): ignore future yarn.lock files
1 parent 39116a6 commit a4ad44c

5 files changed

Lines changed: 10 additions & 4714 deletions

File tree

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77
/coverage
88
.DS_Store
99
*.log
10-
.idea
10+
.idea
11+
yarn.lock

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ env:
2424
install:
2525
- npm install yarn -g
2626
- yarn install
27-
- if [ ! -h "$HOME/.yarn-cache/.link/webpack" ]; then yarn link; fi
27+
- yarn link || true
2828
- yarn link webpack
2929

3030
after_success:

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ environment:
1212
install:
1313
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
1414
- npm install yarn -g
15-
- yarn install --msvs_version=2013
15+
- yarn install
1616
- yarn link
1717
- yarn link webpack
1818

test/RuleSet.test.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,12 @@ describe("RuleSet", function() {
270270
});
271271
describe('when exclude array holds an undefined item', function() {
272272
function errorHasContext(err) {
273-
if (/Expected condition but got falsy value/.test(err)
274-
&& /test/.test(err)
275-
&& /include/.test(err)
276-
&& /exclude/.test(err)
277-
&& /node_modules/.test(err)
278-
&& /undefined/.test(err)) {
273+
if(/Expected condition but got falsy value/.test(err) &&
274+
/test/.test(err) &&
275+
/include/.test(err) &&
276+
/exclude/.test(err) &&
277+
/node_modules/.test(err) &&
278+
/undefined/.test(err)) {
279279
return true;
280280
}
281281
}

0 commit comments

Comments
 (0)