From 267605f66b2e490018fd8425e0d0cb4bc40a3be9 Mon Sep 17 00:00:00 2001 From: Tyler Wanek Date: Fri, 8 Mar 2019 10:54:42 -0700 Subject: [PATCH 01/10] Use LibGit2 branch that still uses libcurl for proxy support --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 97e4179a7..29dabfb49 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 97e4179a76b935a15589a44662ce54a0ce0f3026 +Subproject commit 29dabfb49f8b46c4a1b150e22e8579a9af74ac8c From 371b17f53f4ffd00634675c44efbc2aa01a8fc14 Mon Sep 17 00:00:00 2001 From: Ian Hattendorf Date: Thu, 7 Mar 2019 14:01:43 -0700 Subject: [PATCH 02/10] Remove registry and add curl to gyp --- vendor/libgit2.gyp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index c6e72268b..8ecd8921b 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -174,8 +174,6 @@ "libgit2/src/streams/mbedtls.h", "libgit2/src/streams/openssl.c", "libgit2/src/streams/openssl.h", - "libgit2/src/streams/registry.c", - "libgit2/src/streams/registry.h", "libgit2/src/pack-objects.c", "libgit2/src/pack-objects.h", "libgit2/src/pack.c", @@ -229,6 +227,8 @@ "libgit2/src/sha1_lookup.h", "libgit2/src/signature.c", "libgit2/src/signature.h", + "libgit2/src/streams/curl.c", + "libgit2/src/streams/curl.h", "libgit2/src/streams/socket.c", "libgit2/src/streams/socket.h", "libgit2/src/sortedcache.c", From aebaf875ea0d5b46f0958831aae4fe70bd67f29b Mon Sep 17 00:00:00 2001 From: Steven King Jr Date: Thu, 7 Mar 2019 13:49:51 -0700 Subject: [PATCH 03/10] Add curl links back in --- generate/templates/templates/binding.gyp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/generate/templates/templates/binding.gyp b/generate/templates/templates/binding.gyp index 3d2d80a0d..309168da2 100644 --- a/generate/templates/templates/binding.gyp +++ b/generate/templates/templates/binding.gyp @@ -153,6 +153,13 @@ ] } ], + [ + "OS=='linux' or OS=='mac' or OS.endswith('bsd') or <(is_IBMi) == 1", { + "libraries": [ + " Date: Fri, 8 Mar 2019 09:57:05 -0700 Subject: [PATCH 04/10] Update libgit2.gyp for curl --- vendor/libgit2.gyp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vendor/libgit2.gyp b/vendor/libgit2.gyp index 8ecd8921b..a3a2666f6 100644 --- a/vendor/libgit2.gyp +++ b/vendor/libgit2.gyp @@ -325,7 +325,12 @@ } }], ["OS=='mac' or OS=='linux' or OS.endswith('bsd') or <(is_IBMi) == 1", { + "cflags": [ + "-DGIT_CURL", + " Date: Fri, 8 Mar 2019 12:40:14 -0700 Subject: [PATCH 05/10] Build prebuilts for gitkraken with revert to libcurl changes --- .travis.yml | 2 +- appveyor.yml | 1 + package-lock.json | 2 +- package.json | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2b2add2f6..2c4f9b595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ dist: trusty branches: only: - master - - /^v\d+\.\d+\.\d+(-alpha\.\d+)?$/ + - /^v\d+\.\d+\.\d+(-\S+\.\d+)?$/ compiler: clang language: node_js diff --git a/appveyor.yml b/appveyor.yml index 368e911e8..04f5d3121 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -58,6 +58,7 @@ build: off branches: only: + - /gitkraken\/.*/ - /backport\/.*/ - master - v0.3 diff --git a/package-lock.json b/package-lock.json index 04dff435c..2077e773f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.25.0-alpha.9", + "version": "0.25.0-gitkrakencurl.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index f523fdae1..472bfe62f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.25.0-alpha.9", + "version": "0.25.0-gitkrakencurl.1", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From bfb5ca7d1371f0c027964b9a3d163a7556a020b3 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Wed, 20 Mar 2019 13:20:13 -0700 Subject: [PATCH 06/10] Bring in https://github.com/libgit2/libgit2/pull/5023 --- vendor/libgit2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/libgit2 b/vendor/libgit2 index 29dabfb49..62e9d83f6 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit 29dabfb49f8b46c4a1b150e22e8579a9af74ac8c +Subproject commit 62e9d83f6f7c54683ebbe8521d489da74d2931f6 From d03a4e6c30a46d6cf5e825042c137f5e1825a370 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Wed, 20 Mar 2019 13:27:27 -0700 Subject: [PATCH 07/10] Bump to v0.25.0-gitkrakencurl.2 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2077e773f..fc955b321 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.25.0-gitkrakencurl.1", + "version": "0.25.0-gitkrakencurl.2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 472bfe62f..462c155f0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.25.0-gitkrakencurl.1", + "version": "0.25.0-gitkrakencurl.2", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From 84d4543a9ff341717704388ab5229c9c6d482edc Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Fri, 19 Apr 2019 12:40:32 -0700 Subject: [PATCH 08/10] Bump to v0.25.0-gitkrakencurl.3 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc955b321..66342a99f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.25.0-gitkrakencurl.2", + "version": "0.25.0-gitkrakencurl.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 462c155f0..03c7269dd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.25.0-gitkrakencurl.2", + "version": "0.25.0-gitkrakencurl.3", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From c37453a79a7e380e4fa370caa04f0aa441ead026 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Fri, 3 May 2019 12:48:21 -0700 Subject: [PATCH 09/10] Bump to v0.25.0-gitkrakencurl.4 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 39c195ff7..cae81319f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.25.0-gitkrakencurl.3", + "version": "0.25.0-gitkrakencurl.4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 26a902a8e..5703e552f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.25.0-gitkrakencurl.3", + "version": "0.25.0-gitkrakencurl.4", "homepage": "http://nodegit.org", "keywords": [ "libgit2", From 26599a743e6a85a3b77643365f3c53dd5090b283 Mon Sep 17 00:00:00 2001 From: Tyler Ang-Wanek Date: Tue, 25 Jun 2019 10:59:28 -0700 Subject: [PATCH 10/10] Bump to v0.25.0-gitkrakencurl.7 --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 396a7054d..a6200acd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "nodegit", - "version": "0.25.0-gitkrakencurl.6", + "version": "0.25.0-gitkrakencurl.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 808e65c66..8717492f1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "nodegit", "description": "Node.js libgit2 asynchronous native bindings", - "version": "0.25.0-gitkrakencurl.6", + "version": "0.25.0-gitkrakencurl.7", "homepage": "http://nodegit.org", "keywords": [ "libgit2",