Skip to content

Commit 7800a52

Browse files
committed
Adding comment and moving index.ts for tasks to gulpfile.ts. It was confusing
1 parent 4ba2502 commit 7800a52

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

gulpfile.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
'use strict';
2-
const path = require('path');
2+
/**
3+
* Load the TypeScript compiler, then load the TypeScript gulpfile which simply loads all
4+
* the tasks. The tasks are really inside tools/gulp/tasks.
5+
*/
36

7+
const path = require('path');
48

9+
// Register TS compilation.
510
require('ts-node').register({
611
project: path.join(__dirname, 'tools/gulp')
712
});

tools/gulp/gulpfile.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,10 @@
1-
import './tasks';
1+
import './tasks/ci';
2+
import './tasks/clean';
3+
import './tasks/components';
4+
import './tasks/default';
5+
import './tasks/development';
6+
import './tasks/e2e';
7+
import './tasks/lint';
8+
import './tasks/release';
9+
import './tasks/serve';
10+
import './tasks/spec';

tools/gulp/tasks/ci.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {task} from 'gulp';
22

33

44
task('ci:lint', ['ci:forbidden-identifiers', 'lint']);
5-
task('ci:test', ['test:single-run'], function() { process.exit(0); });
5+
task('ci:test', ['test:single-run']);
66
task('ci:e2e', ['e2e']);
77
task('ci:extract-metadata', [':build:components:ngc']);
88
task('ci:forbidden-identifiers', function() {

tools/gulp/tasks/e2e.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ task('build:e2eapp', buildAppTask('e2eapp'));
3232

3333
task(':test:protractor:setup', execNodeTask('protractor', 'webdriver-manager', ['update']));
3434
task(':test:protractor', execNodeTask('protractor', [PROTRACTOR_CONFIG_PATH]));
35+
// This task is used because, in some cases, protractor will block and not exit the process,
36+
// causing Travis to timeout. This task should always be used in a synchronous sequence as
37+
// the last step.
3538
task(':e2e:done', () => process.exit(0));
3639

3740
let stopE2eServer: () => void = null;

tools/gulp/tasks/index.ts

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)