Skip to content

Test in Node 0.12 and io.js #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
johnhaley81 merged 9 commits into from
Mar 11, 2015
Merged

Test in Node 0.12 and io.js #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96de25f
Test in Node 0.12
tbranyen Mar 5, 2015
866cebc
add io.js to test matrix
maxkorp Mar 6, 2015
9be4c47
add fast-finish and allowed failures to appveyor
maxkorp Mar 6, 2015
18cd0b4
allowed failures and fast-finish for travis
maxkorp Mar 6, 2015
dd58715
Switch from node-gyp to pangyp
Mar 10, 2015
c59309c
Test latest iojs version on appveyor
Mar 10, 2015
825ce42
Fix iojs build in windows
johnhaley81 Mar 11, 2015
a11afb4
Fix hashsig.h location
Mar 11, 2015
766bfb7
Add note about iojs and windows
Mar 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
env:
matrix:
- export NODE_VERSION="0.10"
- export NODE_VERSION="0.12"
- export NODE_VERSION="iojs"
matrix:
fast_finish: true
allow_failures:
- env: NODE_VERSION="0.10"
- env: NODE_VERSION="iojs"
before_install:
- git clone https://github.com/creationix/nvm.git ./.nvm
- source ./.nvm/nvm.sh
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ NodeGit
</tbody>
</table>

***NOTE: NodeGit currently does not work with [iojs on windows](https://github.com/rvagg/pangyp/issues/4)***

**Stable: 0.2.7**

## Have a problem? Come chat with us! ##
Expand Down
14 changes: 12 additions & 2 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,21 @@ init:
# what combinations to test
environment:
matrix:
- nodejs_version: 0.10
# Node.js
- nodejs_version: "0.10"
- nodejs_version: "0.12"
# io.js
- nodejs_version: "1"

matrix:
fast_finish: true
allow_failures:
- nodejs_version: "0.10"
- nodejs_version: "1"

# Get the latest stable version of Node 0.STABLE.latest
install:
- ps: Update-NodeJsInstallation (Get-NodeJsLatestBuild $env:nodejs_version)
- ps: Install-Product node $env:nodejs_version
- cmd: SET PATH=C:\Program Files (x86)\MSBuild\12.0\bin\;%PATH%
- cmd: SET PATH=c:\python27;%PATH%
- cmd: SET JOBS=4
Expand Down
9 changes: 9 additions & 0 deletions generate/templates/templates/binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,15 @@
]
}
}
], [
"OS=='win'", {
"cflags": [
"/EHsc"
],
"defines": [
"_HAS_EXCEPTIONS=1"
]
}
]
]
}
Expand Down
2 changes: 1 addition & 1 deletion lifecycleScripts/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ function build() {
var prefix = "";
var target = "";
var debug = (process.env.BUILD_DEBUG ? " --debug" : "");
var builder = "node-gyp";
var builder = "pangyp";
var distUrl = "";

if (asVersion) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
"lodash": "^3.1.0",
"mocha": "~2.1.0",
"nan": "^1.7.0",
"node-gyp": "~1.0.2",
"nw-gyp": "^0.12.4",
"pangyp": "^2.1.0",
"request": "^2.53.0",
"tar": "^1.0.3"
},
Expand Down
2 changes: 1 addition & 1 deletion vendor/libgit2.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"libgit2/src/hash.c",
"libgit2/src/hash.h",
"libgit2/src/hashsig.c",
"libgit2/src/hashsig.h",
"libgit2/include/git2/sys/hashsig.h",
"libgit2/src/ident.c",
"libgit2/src/ignore.c",
"libgit2/src/ignore.h",
Expand Down