diff options
| author | Pierre Ossman <ossman@cendio.se> | 2018-06-07 14:53:02 +0200 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2018-06-07 14:53:02 +0200 |
| commit | 13364d70ddfd47e25793f03c70e05b1f42e7731c (patch) | |
| tree | d0967223d1ca821cd3f2152ee1a27862267c0812 | |
| parent | 0342e4f4891a0c29f10b25a53258bf40890bc9fd (diff) | |
| parent | 127b63b79f6a419585f3cc12714df2bc9d8cca4e (diff) | |
| download | novnc-13364d70ddfd47e25793f03c70e05b1f42e7731c.tar.gz | |
Merge branch 'travis-lint' of https://github.com/CendioOssman/noVNC
| -rw-r--r-- | .travis.yml | 18 | ||||
| -rw-r--r-- | karma.conf.js | 3 |
2 files changed, 15 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index effb693..0d3f419 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,9 +7,15 @@ 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='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' before_script: npm install -g karma-cli @@ -19,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 diff --git a/karma.conf.js b/karma.conf.js index 7926678..9727c4c 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -20,9 +20,6 @@ module.exports = function(config) { for (let i = 0; i < names.length; i++) { for (let j = 0; j < platforms.length; j++) { - // FIXME Skip tests in Linux since Sauce Labs browser versions are ancient. - // https://github.com/novnc/noVNC/pull/1013#issuecomment-382749805 - if (platforms[j] === 'Linux') continue; for (let k = 0; k < versions.length; k++) { let launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i]; if (versions[k]) { |