FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #468 from nodegit/test-node-012 · javascript-forks/nodegit.nodegit@43b0cc3 · GitHub

  1. javascript-forks
  2. nodegit.nodegit

Repository navigation

Commit 43b0cc3

Browse files
johnhaley81
committed
Merge pull request nodegit#468 from nodegit/test-node-012
Test in Node 0.12 and io.js
2 parents 8527403 + 766bfb7 commit 43b0cc3

7 files changed

Lines changed: 33 additions & 5 deletions

File tree

‎.travis.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
env:
22
matrix:
33
- export NODE_VERSION="0.10"
4+
- export NODE_VERSION="0.12"
5+
- export NODE_VERSION="iojs"
6+
matrix:
7+
fast_finish: true
8+
allow_failures:
9+
- env: NODE_VERSION="0.10"
10+
- env: NODE_VERSION="iojs"
411
before_install:
512
- git clone https://github.com/creationix/nvm.git ./.nvm
613
- source ./.nvm/nvm.sh

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ NodeGit
2727
</tbody>
2828
</table>
2929

30+
***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)***
31+
3032
**Stable: 0.2.7**
3133

3234
## Have a problem? Come chat with us! ##

‎appveyor.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,21 @@ init:
1919
# what combinations to test
2020
environment:
2121
matrix:
22-
- nodejs_version: 0.10
22+
# Node.js
23+
- nodejs_version: "0.10"
24+
- nodejs_version: "0.12"
25+
# io.js
26+
- nodejs_version: "1"
27+
28+
matrix:
29+
fast_finish: true
30+
allow_failures:
31+
- nodejs_version: "0.10"
32+
- nodejs_version: "1"
2333

2434
# Get the latest stable version of Node 0.STABLE.latest
2535
install:
26-
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
36+
- ps: Install-Product node $env:nodejs_version
2737
- cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
2838
- cmd: SET PATH=c:\python27;%PATH%
2939
- cmd: SET JOBS=4

‎generate/templates/templates/binding.gyp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@
5252
]
5353
}
5454
}
55+
], [
56+
"OS=='win'", {
57+
"cflags": [
58+
"/EHsc"
59+
],
60+
"defines": [
61+
"_HAS_EXCEPTIONS=1"
62+
]
63+
}
5564
]
5665
]
5766
}

‎lifecycleScripts/install.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ function build() {
9090
var prefix = "";
9191
var target = "";
9292
var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
93-
var builder = "node-gyp";
93+
var builder = "pangyp";
9494
var distUrl = "";
9595

9696
if (asVersion) {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
"lodash": "^3.1.0",
7070
"mocha": "~2.1.0",
7171
"nan": "^1.7.0",
72-
"node-gyp": "~1.0.2",
7372
"nw-gyp": "^0.12.4",
73+
"pangyp": "^2.1.0",
7474
"request": "^2.53.0",
7575
"tar": "^1.0.3"
7676
},

‎vendor/libgit2.gyp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
"libgit2/src/hash.c",
107107
"libgit2/src/hash.h",
108108
"libgit2/src/hashsig.c",
109-
"libgit2/src/hashsig.h",
109+
"libgit2/include/git2/sys/hashsig.h",
110110
"libgit2/src/ident.c",
111111
"libgit2/src/ignore.c",
112112
"libgit2/src/ignore.h",

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL