travis build changes

changed the order of build running gulp at first
GoogleChrome · Mar 2, 2017 · 0b4e544 · 0b4e544
1 parent 6ffcda4
commit 0b4e544
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,9 +19,7 @@ before_script:
   - export LIGHTHOUSE_CHROMIUM_PATH="$(pwd)/chrome-linux/chrome"
   - sh -e /etc/init.d/xvfb start
   - ./lighthouse-core/scripts/download-chrome.sh
-  - npm run build-cli
-  - npm run build-extension
-  - npm run build-viewer
+  - npm run build-all
 script:
   - npm run lint
   - npm run unit

diff --git a/lighthouse-extension/gulpfile.js b/lighthouse-extension/gulpfile.js
@@ -169,7 +169,7 @@ gulp.task('clean', () => {
 });
 
 
-gulp.task('watch', ['lint', 'browserify', 'html', 'compileReport', 'compilePartials'], () => {
+gulp.task('watch', ['lint', 'compileReport', 'compilePartials', 'browserify', 'html'], () => {
   livereload.listen();
 
   gulp.watch([
@@ -207,7 +207,7 @@ gulp.task('compile-templates', ['compileReport', 'compilePartials']);
 
 gulp.task('build', cb => {
   runSequence(
-    'lint', 'browserify', 'chromeManifest', 'compile-templates',
+    'lint', 'compile-templates', 'browserify', 'chromeManifest',
     ['html', 'images', 'css', 'extras'], cb);
 });
 

diff --git a/lighthouse-viewer/gulpfile.js b/lighthouse-viewer/gulpfile.js
@@ -178,7 +178,7 @@ gulp.task('compile-templates', ['compileReport', 'compilePartials']);
 
 gulp.task('build', cb => {
   runSequence(
-    'lint', 'compile', 'compile-templates',
+    'lint', 'compile-templates', 'compile',
     ['html', 'images', 'concat-css', 'polyfills'], cb);
 });
 

diff --git a/package.json b/package.json
@@ -15,7 +15,7 @@
     "install-cli": "cd ./lighthouse-cli && npm install",
     "install-extension": "cd ./lighthouse-extension && npm install",
     "install-viewer": "cd ./lighthouse-viewer && npm install",
-    "build-all": "npm run build-cli && npm run build-extension && npm run build-viewer",
+    "build-all": "gulp && npm run build-cli && npm run build-extension && npm run build-viewer",
     "build-cli": "cd ./lighthouse-cli && npm run build",
     "build-extension": "cd ./lighthouse-extension && npm run build",
     "build-viewer": "cd ./lighthouse-viewer && npm run build",