CMS-652: Add js linting to travis

kapt-labs · Nov 11, 2015 · 2cf634b · 2cf634b
1 parent 12d4dee
commit 2cf634b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,11 @@ python:
   - 3.3
   - 3.4
 
-sudo: false
+sudo: true
+
+before_install:
+- sudo apt-get update
+- sudo apt-get install nodejs npm
 
 install:
   - ./.travis_setup
@@ -22,7 +26,12 @@ env:
   - DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
   - DJANGO="https://github.com/django/django/archive/master.zip" EASY_THUMBNAILS="easy-thumbnails>2.0"
 
-script: coverage run --rcfile=coverage.rc test_settings.py
+before_script:
+  - npm install
+
+script:
+  - coverage run --rcfile=coverage.rc test_settings.py
+  - gulp ci
 
 after_success:
   - coveralls --config_file=coverage.rc

diff --git a/gulpfile.js b/gulpfile.js
@@ -59,3 +59,4 @@ gulp.task('lint:watch', function () {
 
 gulp.task('compile', ['scss']);
 gulp.task('watch', ['scss:watch', 'lint:watch']);
+gulp.task('ci', ['lint']);
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,3 +59,4 @@ gulp.task('lint:watch', function () {

		gulp.task('compile', ['scss']);
		gulp.task('watch', ['scss:watch', 'lint:watch']);
		gulp.task('ci', ['lint']);