Use newer macOS test machine for Travis

[mirror_novnc.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 5798781f901bf0606ea4b1302fa7693aaf324365..20004d7976a5c119cff4ca6b32dde2b0e84b7bab 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,10 +7,17 @@ node_js:
  - 6
 env:
   matrix:
-  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
-  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10,Linux,OS X 10.11'
+  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10'
+# FIXME Skip tests in Linux since Sauce Labs browser versions are ancient.
+#  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Linux'
+  - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='OS X 10.11'
+  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10'
+#  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Linux'
+  - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='OS X 10.11'
   - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10'
-  - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.11'
+  - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7'
+  - TEST_BROWSER_NAME=microsoftedge TEST_BROWSER_OS='Windows 10'
+  - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.12'
 before_script: npm install -g karma-cli
 addons:
   sauce_connect:
@@ -18,11 +25,17 @@ addons:
   jwt:
     secure: "d3ekMYslpn6R4f0ajtRMt9SUFmNGDiItHpqaXC5T4KI0KMEsxgvEOfJot5PiFFJWg1DSpJZH6oaW2UxGZ3duJLZrXIEd/JePY8a6NtT35BNgiDPgcp+eu2Bu3rhrSNg7/HEsD1ma+JeUTnv18Ai5oMFfCCQJx2J6osIxyl/ZVxA="
 stages:
+- lint
 - test
 - name: deploy
   if: tag is PRESENT
 jobs:
   include:
+  - stage: lint
+    env:
+    addons:
+    before_script:
+    script: npm run lint
   - stage: deploy
     script: skip
     before_script: skip