Skip to content

Commit f0b3825

Browse files
committed
cleaned up ci
1 parent cc95bd9 commit f0b3825

File tree

5 files changed

+7
-19
lines changed

5 files changed

+7
-19
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ env:
2929
matrix:
3030
# Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
3131
- MODE=lint
32-
- MODE=circular_deps
3332
- MODE=extract_metadata
3433
- MODE=e2e
3534
- MODE=saucelabs_required

scripts/ci/build-and-test.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ start_tunnel
1515
wait_for_tunnel
1616
if is_lint; then
1717
$(npm bin)/gulp ci:lint
18-
elif is_circular_deps_check; then
19-
$(npm bin)/gulp ci:check-circular-deps
2018
elif is_e2e; then
2119
$(npm bin)/gulp ci:e2e
2220
elif is_extract_metadata; then

scripts/ci/sources/mode.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ is_lint() {
99
[[ "$MODE" = lint ]]
1010
}
1111

12-
is_circular_deps_check() {
13-
[[ "$MODE" = circular_deps ]]
14-
}
15-
1612
is_extract_metadata() {
1713
[[ "$MODE" = extract_metadata ]]
1814
}

tools/gulp/tasks/ci.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
1-
import gulp = require('gulp');
2-
import {execNodeTask} from '../task_helpers';
1+
import {task} from 'gulp';
32

43

5-
gulp.task('ci:lint', ['ci:forbidden-identifiers', 'lint']);
6-
gulp.task('ci:test', ['test:single-run'], function() {
7-
process.exit(0);
8-
});
9-
gulp.task('ci:e2e', ['e2e']);
10-
gulp.task('ci:extract-metadata', [':build:components:ngc']);
11-
gulp.task('ci:forbidden-identifiers', function() {
4+
task('ci:lint', ['ci:forbidden-identifiers', 'lint']);
5+
task('ci:test', ['test:single-run'], function() { process.exit(0); });
6+
task('ci:e2e', ['e2e']);
7+
task('ci:extract-metadata', [':build:components:ngc']);
8+
task('ci:forbidden-identifiers', function() {
129
require('../../../scripts/ci/forbidden-identifiers.js');
1310
});
14-
15-
gulp.task('ci:check-circular-deps', ['madge']);

tools/gulp/tasks/lint.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import gulp = require('gulp');
22
import {execNodeTask} from '../task_helpers';
33

44

5-
gulp.task('lint', ['tslint', 'stylelint']);
5+
gulp.task('lint', ['tslint', 'stylelint', 'madge']);
66
gulp.task('madge', ['build:release'], execNodeTask('madge', ['--circular', './dist']));
77
gulp.task('stylelint', execNodeTask(
88
'stylelint', ['src/**/*.scss', '--config', 'stylelint-config.json', '--syntax', 'scss']

0 commit comments

Comments
 (0)