Skip to content

Commit

Permalink
Testing travis
Browse files Browse the repository at this point in the history
  • Loading branch information
Evgeniy Negometyanov committed Nov 11, 2015
1 parent 2cf634b commit 95d0892
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 20 deletions.
33 changes: 17 additions & 16 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ python:
sudo: true

before_install:
- sudo apt-get update
- sudo apt-get install nodejs npm
- npm install
- sudo apt-get update
- sudo apt-get install nodejs npm

install:
- ./.travis_setup

env:
- DJANGO="Django>=1.5,<1.6" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
- DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0"
- DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
- DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0"
- 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"

before_script:
- npm install
- TEST_SUITE=backend
- DJANGO="Django>=1.5,<1.6" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>=1.4,<2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0"
- DJANGO="Django>=1.6,<1.7" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
- DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0"
- DJANGO="Django>=1.7,<1.8" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
- DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0"
- 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"
- TEST_SUITE=frontend

script:
- coverage run --rcfile=coverage.rc test_settings.py
- gulp ci
- coverage run --rcfile=coverage.rc test_settings.py:backend
- gulp ci:frontend

after_success:
- coveralls --config_file=coverage.rc
Expand Down Expand Up @@ -68,3 +68,4 @@ matrix:
env: DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
- python: 3.4
env: DJANGO="Django>=1.8,<1.9" EASY_THUMBNAILS="easy-thumbnails>2.0" CUSTOM_IMAGE="filer.test_utils.custom_image.models.Image"
# fast_finish: true
9 changes: 5 additions & 4 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var autoprefixer = require('gulp-autoprefixer');
var sourcemaps = require('gulp-sourcemaps');
var jshint = require('gulp-jshint');
var jscs = require('gulp-jscs');
var stylish = require('jshint-stylish');

var PROJECT_ROOT = __dirname;
var PROJECT_PATH = {
Expand Down Expand Up @@ -42,15 +43,15 @@ gulp.task('scss:watch', function () {
// LINTING
gulp.task('lint', function () {
return gulp.src(PROJECT_PATTERNS.lint)
.pipe(jshint())
.pipe(jscs())
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter(stylish))
.pipe(jscs('.jscsrc'))
.on('error', function (error) {
gutil.log('\n' + error.message);
if (process.env.CI) {
process.exit(1);
}
})
.pipe(jshint.reporter('jshint-stylish'));
});
});

gulp.task('lint:watch', function () {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"gulp-autoprefixer": "3.1.*",
"gulp-jscs": "3.0.*",
"gulp-jshint": "1.12.*",
"jshint-stylish": "2.0.*",
"gulp-sass": "2.1.*",
"gulp-sourcemaps": "1.6.*"
}
Expand Down

0 comments on commit 95d0892

Please sign in to comment.