From 680d4e3b4e0ec27204b8a1e026b0c365442020e1 Mon Sep 17 00:00:00 2001 From: Kishan Sambhi Date: Tue, 15 Mar 2016 18:52:22 +0000 Subject: [PATCH 01/10] Put the path to node-pre-gyp in quotes in install.js This is to help resolve nodegit/nodegit#950 --- lifecycleScripts/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 34989f2ac..c59ac9c5d 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -36,7 +36,7 @@ return installPrebuilt(); function installPrebuilt() { console.info("[nodegit] Fetching binary from S3."); var npg = pathForTool("node-pre-gyp"); - return exec(npg + " install --fallback-to-build=false") + return exec('"'+ npg + '" install --fallback-to-build=false') .then( function() { console.info("[nodegit] Completed installation successfully."); From 6be31fe290e0efc8e4e8bb16797bb0a6dc6b2acc Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 12:25:05 -0700 Subject: [PATCH 02/10] Bump nan to 2.2.0 This should fix building for node 5.8.0+ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a750a6d..19dee3ecb 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lcov-result-merger": "~1.0.2", "lodash": "~3.10.1", "mocha": "~2.3.4", - "nan": "~2.0.9", + "nan": "^2.2.0", "node-gyp": "~3.0.3", "nw-gyp": "~0.12.4" }, From e9d50fa446394da442080c089b19ea79c0bc60dd Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 12:35:14 -0700 Subject: [PATCH 03/10] Use node 5.8.x on CI --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d10faa0fc..55a1c2ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: matrix: - export NODE_VERSION="0.12" - export NODE_VERSION="4.1" - - export NODE_VERSION="5.0" + - export NODE_VERSION="5.8" matrix: fast_finish: true diff --git a/appveyor.yml b/appveyor.yml index 41d4f90ff..337d1250f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ environment: - nodejs_version: "0.12" # Node.js - nodejs_version: "4.1" - - nodejs_version: "5.0" + - nodejs_version: "5.8" matrix: fast_finish: true From 1af2386a033a5ada9e2c4d81fdd398e8b352509d Mon Sep 17 00:00:00 2001 From: Kishan Sambhi Date: Tue, 15 Mar 2016 20:29:17 +0000 Subject: [PATCH 04/10] Fix issue where " is required When building on appveyor, the linter exited with 1. To fix this, we are putting an \ before " --- lifecycleScripts/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index c59ac9c5d..0302d6743 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -36,7 +36,7 @@ return installPrebuilt(); function installPrebuilt() { console.info("[nodegit] Fetching binary from S3."); var npg = pathForTool("node-pre-gyp"); - return exec('"'+ npg + '" install --fallback-to-build=false') + return exec("\""+ npg + "\" install --fallback-to-build=false") .then( function() { console.info("[nodegit] Completed installation successfully."); From 1cfb51b8bb8de122e16950d3d6d814af0a93d161 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 15:01:57 -0700 Subject: [PATCH 05/10] Skip broken http test --- test/tests/clone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/clone.js b/test/tests/clone.js index 46830a889..cbb0d1c5d 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -27,7 +27,7 @@ describe("Clone", function() { }); }); - it("can clone with http", function() { + it.skip("can clone with http", function() { var test = this; var url = "http://git.tbranyen.com/smart/site-content"; From 74ff59565734ef8b5a5cac2e6989247e3223ef40 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 12:25:05 -0700 Subject: [PATCH 06/10] Bump nan to 2.2.0 This should fix building for node 5.8.0+ --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 03a750a6d..19dee3ecb 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "lcov-result-merger": "~1.0.2", "lodash": "~3.10.1", "mocha": "~2.3.4", - "nan": "~2.0.9", + "nan": "^2.2.0", "node-gyp": "~3.0.3", "nw-gyp": "~0.12.4" }, From 6642a763c42a28e751e1406780f806ec6c4d7e11 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 12:35:14 -0700 Subject: [PATCH 07/10] Use node 5.8.x on CI --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d10faa0fc..55a1c2ad9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: matrix: - export NODE_VERSION="0.12" - export NODE_VERSION="4.1" - - export NODE_VERSION="5.0" + - export NODE_VERSION="5.8" matrix: fast_finish: true diff --git a/appveyor.yml b/appveyor.yml index 41d4f90ff..337d1250f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,7 +31,7 @@ environment: - nodejs_version: "0.12" # Node.js - nodejs_version: "4.1" - - nodejs_version: "5.0" + - nodejs_version: "5.8" matrix: fast_finish: true From 4f3561727349087797543d79e9fd8c578fc21d04 Mon Sep 17 00:00:00 2001 From: John Haley Date: Tue, 15 Mar 2016 15:01:57 -0700 Subject: [PATCH 08/10] Skip broken http test --- test/tests/clone.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/clone.js b/test/tests/clone.js index 46830a889..cbb0d1c5d 100644 --- a/test/tests/clone.js +++ b/test/tests/clone.js @@ -27,7 +27,7 @@ describe("Clone", function() { }); }); - it("can clone with http", function() { + it.skip("can clone with http", function() { var test = this; var url = "http://git.tbranyen.com/smart/site-content"; From 612540e02965503f3e91aced8c567374a12fcd3a Mon Sep 17 00:00:00 2001 From: Kishan Sambhi Date: Tue, 15 Mar 2016 18:52:22 +0000 Subject: [PATCH 09/10] Put the path to node-pre-gyp in quotes in install.js This is to help resolve nodegit/nodegit#950 --- lifecycleScripts/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index 34989f2ac..c59ac9c5d 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -36,7 +36,7 @@ return installPrebuilt(); function installPrebuilt() { console.info("[nodegit] Fetching binary from S3."); var npg = pathForTool("node-pre-gyp"); - return exec(npg + " install --fallback-to-build=false") + return exec('"'+ npg + '" install --fallback-to-build=false') .then( function() { console.info("[nodegit] Completed installation successfully."); From f451b689fe9f3a74e072178a2187d675424ea1df Mon Sep 17 00:00:00 2001 From: Kishan Sambhi Date: Tue, 15 Mar 2016 20:29:17 +0000 Subject: [PATCH 10/10] Fix issue where " is required When building on appveyor, the linter exited with 1. To fix this, we are putting an \ before " --- lifecycleScripts/install.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lifecycleScripts/install.js b/lifecycleScripts/install.js index c59ac9c5d..0302d6743 100644 --- a/lifecycleScripts/install.js +++ b/lifecycleScripts/install.js @@ -36,7 +36,7 @@ return installPrebuilt(); function installPrebuilt() { console.info("[nodegit] Fetching binary from S3."); var npg = pathForTool("node-pre-gyp"); - return exec('"'+ npg + '" install --fallback-to-build=false') + return exec("\""+ npg + "\" install --fallback-to-build=false") .then( function() { console.info("[nodegit] Completed installation successfully.");