Merge pull request socketio#920 from nkzawa/patch-20

Fix travis settings
tobiasmuecksch · Dec 2, 2015 · a64a1a3 · a64a1a3
2 parents 64e65aa + 444f9eb
commit a64a1a3
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,16 +24,15 @@ matrix:
     env: BROWSER_NAME=ie BROWSER_VERSION=10 BROWSER_PLATFORM="Windows 2012"
   - node_js: '0.10'
     env: BROWSER_NAME=ie BROWSER_VERSION=latest BROWSER_PLATFORM="Windows 2012"
-  - node_js: '0.10'
-    env: BROWSER_NAME=edge BROWSER_VERSION=latest BROWSER_PLATFORM="Windows 10"
+# zuul doesn't work on Microsoft Edge: issues/232
+# - node_js: '0.10'
+#   env: BROWSER_NAME=microsoftedge BROWSER_VERSION=latest BROWSER_PLATFORM="Windows 10"
   - node_js: '0.10'
     env: BROWSER_NAME=iphone BROWSER_VERSION=6.1
   - node_js: '0.10'
     env: BROWSER_NAME=iphone BROWSER_VERSION=7.1
   - node_js: '0.10'
-    env: BROWSER_NAME=iphone BROWSER_VERSION=8.4.1
-  - node_js: '0.10'
-    env: BROWSER_NAME=iphone BROWSER_VERSION=9.1
+    env: BROWSER_NAME=iphone BROWSER_VERSION=8.4
   - node_js: '0.10'
     env: BROWSER_NAME=iphone BROWSER_VERSION=latest
   - node_js: '0.10'