mirror of
https://github.com/videojs/video.js.git
synced 2025-01-27 11:22:06 +02:00
revert 75116d4 adding chrome to travis (#3254)
This commit is contained in:
parent
55c101de0c
commit
5cafd387ea
@ -2,7 +2,7 @@ language: node_js
|
|||||||
node_js:
|
node_js:
|
||||||
- 0.12
|
- 0.12
|
||||||
before_install:
|
before_install:
|
||||||
- export CHROME_BIN=/usr/bin/google-chrome
|
- export CHROME_BIN=chromium-browser
|
||||||
- export DISPLAY=:99.0
|
- export DISPLAY=:99.0
|
||||||
- sh -e /etc/init.d/xvfb start
|
- sh -e /etc/init.d/xvfb start
|
||||||
notifications:
|
notifications:
|
||||||
@ -25,8 +25,3 @@ cache:
|
|||||||
- node_modules
|
- node_modules
|
||||||
addons:
|
addons:
|
||||||
firefox: latest
|
firefox: latest
|
||||||
apt:
|
|
||||||
sources:
|
|
||||||
- google-chrome
|
|
||||||
packages:
|
|
||||||
- google-chrome-stable
|
|
||||||
|
@ -107,7 +107,7 @@ module.exports = function(config) {
|
|||||||
'ie8_bs'
|
'ie8_bs'
|
||||||
];
|
];
|
||||||
} else {
|
} else {
|
||||||
settings.browsers = ['chrome_travis', 'Firefox'];
|
settings.browsers = ['Firefox'];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,11 +116,6 @@ module.exports = function(config) {
|
|||||||
|
|
||||||
function getCustomLaunchers(){
|
function getCustomLaunchers(){
|
||||||
return {
|
return {
|
||||||
chrome_travis: {
|
|
||||||
base: 'Chrome',
|
|
||||||
flags: ['--no-sandbox']
|
|
||||||
},
|
|
||||||
|
|
||||||
chrome_bs: {
|
chrome_bs: {
|
||||||
base: 'BrowserStack',
|
base: 'BrowserStack',
|
||||||
browser: 'chrome',
|
browser: 'chrome',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user