Skip to content

Commit

Permalink
ci(Travis): angular#88 enable circular dependency checks
Browse files Browse the repository at this point in the history
 - adds lint to travis matrix
 - enables mode in build-and-test.sh
 - updates madge to 1.4.4
   - changes from 0.6.0 to 1.4.4 don't effect usage
 - updates yarn lock file accordingly
  • Loading branch information
joshwiens committed Jan 4, 2017
1 parent dde6e87 commit 4f445c9
Show file tree
Hide file tree
Showing 4 changed files with 267 additions and 50 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ env:
- secure: "fq/U7VDMWO8O8SnAQkdbkoSe2X92PVqg4d044HmRYVmcf6YbO48+xeGJ8yOk0pCBwl3ISO4Q2ot0x546kxfiYBuHkZetlngZxZCtQiFT9kyId8ZKcYdXaIW9OVdw3Gh3tQyUwDucfkVhqcs52D6NZjyE2aWZ4/d1V4kWRO/LMgo="
matrix:
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
- MODE=lint
- MODE=saucelabs_required
- MODE=browserstack_required
- MODE=saucelabs_optional
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
"karma-sauce-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "1.8.0",
"madge": "^0.6.0",
"madge": "^1.4.4",
"merge2": "^1.0.2",
"minimist": "^1.2.0",
"null-loader": "^0.1.1",
Expand Down
6 changes: 5 additions & 1 deletion tools/scripts/ci/build-and-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ source tools/scripts/ci/sources/tunnel.sh
start_tunnel
wait_for_tunnel

$(npm bin)/gulp ci:test
if is_lint; then
$(npm bin)/gulp ci:lint
else
$(npm bin)/gulp ci:test
fi

teardown_tunnel
Loading

0 comments on commit 4f445c9

Please sign in to comment.