Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use local gulp installed in node_modules in travis #5554

Merged
merged 1 commit into from
Oct 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
before_script:
- npm install -g gulp
- pip install --user protobuf
script: node build-system/pr-check.js $TRAVIS_COMMIT_RANGE
branches:
Expand Down
20 changes: 11 additions & 9 deletions build-system/pr-check.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
const child_process = require('child_process');
const path = require('path');

const gulp = 'node_modules/gulp/bin/gulp.js';

/**
* Executes the provided command, returning its stdout as an array of lines.
* This will throw an exception if something goes wrong.
Expand Down Expand Up @@ -133,26 +135,26 @@ function main(argv) {

if (buildTargets.has('RUNTIME')) {
execOrDie('npm run ava');
execOrDie('gulp lint');
execOrDie('gulp build --css-only');
execOrDie('gulp check-types');
execOrDie('gulp dist --fortesting');
execOrDie(`${gulp} lint`);
execOrDie(`${gulp} build --css-only`);
execOrDie(`${gulp} check-types`);
execOrDie(`${gulp} dist --fortesting`);
}

execOrDie('gulp presubmit');
execOrDie(`${gulp} presubmit`);

if (buildTargets.has('RUNTIME')) {
// dep-check needs to occur after build since we rely on build to generate
// the css files into js files.
execOrDie('gulp dep-check');
execOrDie(`${gulp} dep-check`);
// Unit tests with Travis' default chromium
execOrDie('gulp test --nobuild --compiled');
execOrDie(`${gulp} test --nobuild --compiled`);
// Integration tests with all saucelabs browsers
execOrDie('gulp test --nobuild --saucelabs --integration --compiled');
execOrDie(`${gulp} test --nobuild --saucelabs --integration --compiled`);
// All unit tests with an old chrome (best we can do right now to pass tests
// and not start relying on new features).
// Disabled because it regressed. Better to run the other saucelabs tests.
execOrDie('gulp test --saucelabs --oldchrome');
execOrDie(`${gulp} test --saucelabs --oldchrome`);
}

if (buildTargets.has('VALIDATOR_WEBUI')) {
Expand Down