Skip to content

Commit 78f860f

Browse files
authored
Merge pull request #43 from bengourley/fix-ci
Fix CI
2 parents 5ace455 + 93d832a commit 78f860f

File tree

4 files changed

+951
-1144
lines changed

4 files changed

+951
-1144
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
language: node_js
22
sudo: required
33
dist: trusty
4-
node_js: stable
4+
node_js:
5+
- 8
56
addons:
67
sauce_connect: true
78
firefox: latest

karma.conf.ci.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ module.exports = function(config) {
66

77
// Check out https://saucelabs.com/platforms for all browser/platform combos
88
var customLaunchers = {
9-
slIOS8: {
10-
base: 'SauceLabs',
11-
browserName: 'iPhone',
12-
platform: 'OS X 10.10',
13-
version: '8.4'
14-
},
9+
// slIOS8: {
10+
// base: 'SauceLabs',
11+
// browserName: 'iPhone',
12+
// platform: 'OS X 10.12',
13+
// version: '8.4'
14+
// },
1515
slIOS9: {
1616
base: 'SauceLabs',
1717
browserName: 'iPhone',
18-
platform: 'OS X 10.11',
19-
version: '9.2'
18+
platform: 'OS X 10.12',
19+
version: '9.3'
2020
},
2121
// *Sigh* Cannot get this working with appium or selenium...
2222
// slIOS10: {
@@ -73,13 +73,15 @@ module.exports = function(config) {
7373
slSafari10: {
7474
base: 'SauceLabs',
7575
browserName: 'safari',
76-
platform: 'macOS 10.12',
76+
platform: 'OS X 10.11',
7777
version: '10.0'
7878
},
79-
slOpera: {
80-
base: 'SauceLabs',
81-
browserName: 'opera'
82-
},
79+
// SauceLabs discontinued support for all versions of Opera:
80+
// https://wiki.saucelabs.com/pages/viewpage.action?pageId=70074721
81+
// slOpera: {
82+
// base: 'SauceLabs',
83+
// browserName: 'opera'
84+
// },
8385
slEdge14: {
8486
base: 'SauceLabs',
8587
browserName: 'microsoftedge',

0 commit comments

Comments
 (0)