summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKimmo Brunfeldt <kimmobrunfeldt@gmail.com>2016-06-13 16:08:39 +0300
committerGitHub <noreply@github.com>2016-06-13 16:08:39 +0300
commit08f8d083aa17d3b429928fb2bc7aec748ae59370 (patch)
treefba18c6767d4104c11b5cfa66019b060768adc32
parent0044964043661f4438899a0a01cfd4fae76636d9 (diff)
parenteb0687ba088709e7b77e4340a8b8675b4393ef28 (diff)
downloadgit-hours-08f8d083aa17d3b429928fb2bc7aec748ae59370.zip
git-hours-08f8d083aa17d3b429928fb2bc7aec748ae59370.tar.gz
git-hours-08f8d083aa17d3b429928fb2bc7aec748ae59370.tar.bz2
Merge pull request #23 from mrPjer/master
Add Node.js 6 support
-rw-r--r--.travis.yml6
-rw-r--r--README.md2
-rw-r--r--package.json2
3 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 454e8b1..c4de19c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ node_js:
- 0.12
- 4
- 5
+ - 6
sudo: false
git:
@@ -15,9 +16,12 @@ notifications:
email:
- kimmobrunfeldt+git-hours@gmail.com
+env:
+ - CXX=g++-4.8
+
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- - libstdc++-4.9-dev
+ - g++-4.8
diff --git a/README.md b/README.md
index 4a66406..697c90c 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ From a person working 8 hours per day, it would take more than 3 years to build
$ npm install -g git-hours
-Has been tested and works with node 0.12, 4.x, 5.x versions. **Do not use node version
+Has been tested and works with node 0.12, 4.x, 5.x, 6.x versions. **Do not use node version
below 0.12**.
**NOTE:** If for some reason `git hours` won't work, try to `npm install -g nodegit`.
diff --git a/package.json b/package.json
index bb60edb..ce9067c 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
"commander": "^2.2.0",
"lodash": "^2.4.1",
"moment": "^2.10.6",
- "nodegit": "^0.11.0"
+ "nodegit": "^0.13.2"
},
"devDependencies": {
"eslint": "^1.5.1",