Update Travis setup

- Run tests on latest stable Chrome rather than Sauce Labs - Install dependencies only when necessary - Remove deprecated `sudo: false`
jsdom · Sep 27, 2019 · e3744f5 · e3744f5
1 parent f4706fc
commit e3744f5
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 266 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,10 +3,9 @@ node_js:
   - 8
   - 10
   - stable
-sudo: false
 
-git:
-  submodules: false
+before_install:
+  - test/web-platform-tests/tests/wpt make-hosts-file | sudo tee -a /etc/hosts
 
 install:
   - yarn --frozen-lockfile
@@ -19,92 +18,22 @@ branches:
   only:
     - master
 
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - g++-4.8
-      - libcairo2-dev
-      - libjpeg8-dev
-      - libpango1.0-dev
-      - libgif-dev
-      - build-essential
-  sauce_connect:
-    username: "jsdom"
-    access_key: "7d402b1d-0388-467c-8d99-edf195456eee"
-  hosts:
-    - www1.xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - xn--lve-6lad.www1.web-platform.test
-    - www.www2.not-web-platform.test
-    - www2.www2.not-web-platform.test
-    - xn--lve-6lad.www.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - www.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www.not-web-platform.test
-    - not-web-platform.test
-    - www1.www.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www1.web-platform.test
-    - www2.not-web-platform.test
-    - www1.not-web-platform.test
-    - www1.www1.web-platform.test
-    - www2.xn--lve-6lad.web-platform.test
-    - www1.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - www1.www2.web-platform.test
-    - xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - xn--lve-6lad.xn--lve-6lad.not-web-platform.test
-    - www2.www1.not-web-platform.test
-    - www2.xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - www.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.not-web-platform.test
-    - xn--lve-6lad.www.web-platform.test
-    - www.www.web-platform.test
-    - www1.xn--lve-6lad.web-platform.test
-    - xn--lve-6lad.www2.web-platform.test
-    - www.www2.web-platform.test
-    - www2.www.web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www2.not-web-platform.test
-    - www1.www.web-platform.test
-    - www.xn--lve-6lad.web-platform.test
-    - www.www.not-web-platform.test
-    - xn--lve-6lad.xn--lve-6lad.web-platform.test
-    - xn--lve-6lad.www1.not-web-platform.test
-    - www1.www1.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www2.web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www1.not-web-platform.test
-    - www2.www2.web-platform.test
-    - xn--lve-6lad.web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.www.web-platform.test
-    - xn--lve-6lad.not-web-platform.test
-    - www2.xn--n8j6ds53lwwkrqhv28a.not-web-platform.test
-    - www2.xn--lve-6lad.not-web-platform.test
-    - xn--n8j6ds53lwwkrqhv28a.xn--lve-6lad.web-platform.test
-    - www1.xn--lve-6lad.not-web-platform.test
-    - www1.web-platform.test
-    - www.www1.web-platform.test
-    - www2.web-platform.test
-    - www.xn--lve-6lad.not-web-platform.test
-    - www.web-platform.test
-    - xn--lve-6lad.xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - www1.www2.not-web-platform.test
-    - www2.www1.web-platform.test
-    - www.www1.not-web-platform.test
-    - www.xn--n8j6ds53lwwkrqhv28a.web-platform.test
-    - xn--lve-6lad.www2.not-web-platform.test
-    - www2.www.not-web-platform.test
-
 matrix:
   include:
     - node_js: 8
       env: TEST_SUITE=node-canvas
-      script: "export CXX=g++-4.8 && yarn add canvas && yarn test --retries 1"
-    # - node_js: stable
-    #   env: TEST_SUITE=node-canvas
-    #   script: "export CXX=g++-4.8 && yarn add canvas && yarn test --retries 1"
+      addons:
+        apt:
+          packages:
+            - build-essential
+            - libcairo2-dev
+            - libpango1.0-dev
+            - libjpeg-dev
+            - libgif-dev
+            - librsvg2-dev
+      script: "yarn add canvas && yarn test --retries 1"
     - node_js: stable
       env: TEST_SUITE=browser
-      script: '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || (yarn pretest && yarn test-browser)'
+      addons:
+        chrome: stable
+      script: "yarn test-browser"
diff --git a/package.json b/package.json
@@ -71,7 +71,6 @@
     "karma-chrome-launcher": "^3.1.0",
     "karma-mocha": "^1.3.0",
     "karma-mocha-webworker": "^1.3.0",
-    "karma-sauce-launcher": "^2.0.2",
     "minimatch": "^3.0.4",
     "mocha": "^6.2.0",
     "mocha-sugar-free": "^1.4.0",

diff --git a/test/karma-ci.js b/test/karma-ci.js
diff --git a/test/karma-webworker.conf.js b/test/karma-webworker.conf.js
@@ -2,7 +2,6 @@
 "use strict";
 
 const path = require("path");
-const applyCIOptions = require("./karma-ci");
 
 module.exports = config => {
   const options = {
@@ -51,7 +50,7 @@ module.exports = config => {
       mochaWebWorker: {
         // The "karma-browserify" plugin injects a script which contains the generated bundle, with an url
         // that looks like:
-        //   /absoluteC:/Users/JORIS_~1/AppData/Local/Temp/6b4966e7ca75e6aaf594c1d334b1ce0f.browserify
+        //   /absoluteC:/Users/JORIS_~1/AppData/Local/Temp/6b4966e7ca75e6aaf594c1d334b1ce0f.browserify.js
         // The plugin then replaces our script (test/index.js) with a single `require()` call.
         //
         // Currently, chrome can not display a stack for errors that occur during importScripts():
@@ -64,7 +63,7 @@ module.exports = config => {
         // "karma-browserify" is now no longer used. Instead we use the `client.mochaWebWorker.evaluate.beforeRun`
         // setting, which "karma-mocha-webworker" passes to eval() just before starting the mocha run.
 
-        pattern: ["*browserify"],
+        pattern: ["*browserify.js"],
         evaluate: {
           beforeRun:
             "require(" +
@@ -81,13 +80,9 @@ module.exports = config => {
     logLevel: config.LOG_INFO,
     autoWatch: true,
 
-    browsers: ["Chrome"],
+    browsers: ["ChromeHeadless"],
     singleRun: true
   };
 
-  if (process.env.TEST_SUITE === "browser") {
-    applyCIOptions(options);
-  }
-
   config.set(options);
 };
diff --git a/test/karma.conf.js b/test/karma.conf.js
@@ -2,7 +2,6 @@
 "use strict";
 
 const nodePath = require("path");
-const applyCIOptions = require("./karma-ci");
 
 module.exports = config => {
   const options = {
@@ -52,13 +51,9 @@ module.exports = config => {
     logLevel: config.LOG_INFO,
     autoWatch: true,
 
-    browsers: ["Chrome"],
+    browsers: ["ChromeHeadless"],
     singleRun: true
   };
 
-  if (process.env.TEST_SUITE === "browser") {
-    applyCIOptions(options);
-  }
-
   config.set(options);
 };