Merge pull request #1319 from wavezhang/patch-2

[mirror_novnc.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index effb6934714679c1af23acad8a6ecea86865be52..da51f6777f091f21b839d471302308d83bb370af 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,14 +4,20 @@ cache:
   directories:
   - node_modules
 node_js:
- - 6
+  - lts/*
 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='internet explorer' TEST_BROWSER_OS='Windows 10,Windows 7'
+  - 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='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.11'
+  - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.13'
 before_script: npm install -g karma-cli
 addons:
   sauce_connect:
@@ -19,19 +25,33 @@ 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
+  -
+    env:
+    addons:
+    before_script:
+    script: git ls-tree --name-only -r HEAD | grep -E "[.](html|css)$" | xargs ./utils/validate
   - stage: deploy
+    env:
+    addons:
     script: skip
     before_script: skip
     deploy:
       provider: npm
-      email: directxman12+npm@gmail.com
+      skip_cleanup: true
+      email: ossman@cendio.se
       api_key:
-        secure: cIidkFmvkdmdwWsqBpxyPUCzBqgK8LhPiNxTrIfhwbUunMsJep9MiiBJtv8poVYG2Y4yfiZmqGn4nfetUdc/LDctd73j+/EM4Z/NUDexVAhJ+9/qCogvpJsSQ96VQo7yBceW4E1fBM3WCU0kcGToYIVSSrwvvRDtJfeYJf2Qqw0=
+        secure: "Qq2Mi9xQawO2zlAigzshzMu2QMHvu1IaN9l0ZIivE99wHJj7eS5f4miJ9wB+/mWRRgb3E8uj9ZRV24+Oc36drlBTU9sz+lHhH0uFMfAIseceK64wZV9sLAZm472fmPp2xdUeTCCqPaRy7g1XBqiJ0LyZvEFLsRijqcLjPBF+b8w="
       on:
         tags: true
         repo: novnc/noVNC