From 0b8dc2ce742d88c64f3ec4a2fa944a6c9f182f96 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Tue, 17 May 2016 11:21:52 +0200 Subject: [PATCH] feat: add support for node 6 --- .travis.yml | 5 +++-- appveyor.yml | 1 + docs/intro/01-installation.md | 2 +- docs/intro/04-faq.md | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9173ee6f2..5c20f6ca1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,9 @@ language: node_js node_js: - "0.10" - "0.12" - - "4" - - "5" + - 4 + - 5 + - 6 env: global: diff --git a/appveyor.yml b/appveyor.yml index 883710b9d..95b976729 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -5,6 +5,7 @@ environment: - nodejs_version: "0.12" - nodejs_version: "4" - nodejs_version: "5" + - nodejs_version: "6" matrix: fast_finish: true diff --git a/docs/intro/01-installation.md b/docs/intro/01-installation.md index 9bfd3ea1b..de8233954 100644 --- a/docs/intro/01-installation.md +++ b/docs/intro/01-installation.md @@ -5,7 +5,7 @@ Karma runs on [Node.js] and is available as an [NPM] package. On Mac or Linux we recommend using [NVM](https://github.com/creationix/nvm). On Windows, download Node.js from [the official site](https://nodejs.org/) or use the [NVM PowerShell Module](https://www.powershellgallery.com/packages/nvm). -Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, and **5.x**. See [FAQ] for more info. +Note: Karma currently works on Node.js **0.10**, **0.12.x**, **4.x**, **5.x**, and **6.x**. See [FAQ] for more info. ## Installing Karma and plugins diff --git a/docs/intro/04-faq.md b/docs/intro/04-faq.md index 8b365455f..35fa7e9d0 100644 --- a/docs/intro/04-faq.md +++ b/docs/intro/04-faq.md @@ -25,7 +25,7 @@ The latest stable version from NPM (`npm install karma`). See [versioning] for m ### Which version of Node.js does Karma run with? -Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x** and **5.x** at this point. Additionally, Node **0.10** is currently supported. +Karma works on all LTS versions node in active maintenance state (see [LTS docs](https://github.com/nodejs/LTS/blob/master/README.md) for more info) as well as the latest stable version. That is **0.12.x**, **4.x**, **5.x** and **6.x** at this point. Additionally, Node **0.10** is currently supported. [mailing list]: https://groups.google.com/d/forum/karma-users diff --git a/package.json b/package.json index 50031d615..06e92c893 100644 --- a/package.json +++ b/package.json @@ -357,7 +357,7 @@ "karma": "./bin/karma" }, "engines": { - "node": "0.10 || 0.12 || 4 || 5" + "node": "0.10 || 0.12 || 4 || 5 || 6" }, "version": "0.13.22", "license": "MIT",