Skip to content

Commit

Permalink
Hopefully fix Travis CI for PRs once and for all.
Browse files Browse the repository at this point in the history
  • Loading branch information
eriwen committed Jan 6, 2016
1 parent c04637c commit e254885
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -9,11 +9,11 @@ addons:
- google-chrome
packages:
- google-chrome-stable
before_install:
- export CHROME_BIN=chromium-browser
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
before_script:
- npm install
script:
- if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then gulp ci; else gulp pr; fi
env:
global:
- secure: VGFNdtgz47pAI9fgXyej0Z10qdcHMjYBgCrHQQLdxDnsEtPqQL77H/TTGgw9xq1wF9BmVM2AS3bCrmHmgZboHaG0QSx813eiNs5ewQvSutrDMpBVqyKcnHvYf3L5WSeOvW8nCcKlh8TTaNSGc27+x0x6UGppI8NfVbZQvjcef5g=
- secure: iEbcv7NrXQtl91xn10xl2z+s76a0Isg5WO6RqCAqeXS9/OWgxgbubLFCPZwfdIMYOpdj7U03iaKL1CzOmT5rFOjM/nxyVu9k7q5WYXwW9HnecVPbXGWEQv6VDDV9QH1Lbh/KtwFKl5YJw7nFTzhCnT6g33aocywwAKL6cwjSQn4=
2 changes: 1 addition & 1 deletion gulpfile.js
Expand Up @@ -28,7 +28,7 @@ gulp.task('test', function (done) {
gulp.task('test-pr', ['copy', 'dist'], function (done) {
new karma.Server({
configFile: __dirname + '/karma.conf.js',
browsers: ['Firefox', 'Chrome'],
browsers: ['Firefox', 'Chrome_Travis'],
singleRun: true
}, done).start();
});
Expand Down
7 changes: 6 additions & 1 deletion karma.conf.js
Expand Up @@ -11,7 +11,12 @@ module.exports = function (config) {
colors: true,
logLevel: config.LOG_INFO,
autoWatch: true,
//browsers: ['Firefox', 'ChromeCanary', 'Opera', 'Safari'],
customLaunchers: {
Chrome_Travis: {
base: 'Chrome',
flags: ['--no-sandbox']
}
},
browsers: ['PhantomJS2'],
singleRun: false
});
Expand Down

0 comments on commit e254885

Please sign in to comment.