Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
commit
26251a5c9c
|
@ -5,7 +5,8 @@ env:
|
|||
- "BROWSER='chrome::Windows 10'"
|
||||
- "BROWSER='MicrosoftEdge:14.14393:Windows 10'"
|
||||
- "BROWSER='internet explorer:11.103:Windows 10'"
|
||||
- "BROWSER='safari:10.0:macOS 10.12'"
|
||||
#- "BROWSER='safari:10.0:macOS 10.12'"
|
||||
- "BROWSER='safari:9.0:OS X 10.11'"
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
|
|
|
@ -7,6 +7,7 @@ if (process.env.TRAVIS_PULL_REQUEST && process.env.TRAVIS_PULL_REQUEST !== 'fals
|
|||
return;
|
||||
}
|
||||
|
||||
// https://wiki.saucelabs.com/display/DOCS/Platform+Configurator#/
|
||||
var driver;
|
||||
if (process.env.SAUCE_USERNAME !== undefined) {
|
||||
var browserArray = process.env.BROWSER.split(':');
|
||||
|
|
Loading…
Reference in New Issue