fix: do not build the prebuilt binares with c-ares as this may cause …

…issues Closes #280
JCMais · Mar 24, 2021 · a8cf0ed · a8cf0ed
1 parent d9e2194
commit a8cf0ed
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Changed
 ### Removed
 
+## [2.3.2] - 2021-03-24
+
+### Changed
+- The prebuilt binaries are not build with c-ares anymore, for reasoning see issue [#280](https://github.com/JCMais/node-libcurl/issues/280).
+  c-ares was included in the prebuilt binaries starting with `2.3.0`.
+
 ## [2.3.1] - 2021-03-09
 
 The yes, `curly` is still experimental release. 😅
@@ -86,7 +92,7 @@ As `curly` is marked as experimental, this allows us to do a breaking change in
 - Support libcurl info `CURLINFO_PROXY_ERROR`. Use `CurlPx` for constants. Requires libcurl >= 7.73.0.
 - Support libcurl option `CURLOPT_SSL_EC_CURVES`. Requires libcurl >= 7.73.0.
 - Added prebuilt binaries for Electron v10.1
-- The libcurl version being used by prebuilt binaries is now 7.73.0 and it's not built with c-ares.
+- The libcurl version being used by prebuilt binaries is now 7.73.0 and it's now built with c-ares.
 
 ### Changed
 - `curly` now has 100% code coverage.
@@ -315,7 +321,8 @@ Special Thanks to [@koskokos2](https://github.com/koskokos2) for their contribut
 - Improved code style, started using prettier
 ## [1.2.0] - 2017-08-28
 
-[Unreleased]: https://github.com/JCMais/node-libcurl/compare/v2.3.0...HEAD
+[Unreleased]: https://github.com/JCMais/node-libcurl/compare/v2.3.2...HEAD
+[2.3.2]: https://github.com/JCMais/node-libcurl/compare/v2.3.1...v2.3.2
 [2.3.1]: https://github.com/JCMais/node-libcurl/compare/v2.3.0...v2.3.1
 [2.3.0]: https://github.com/JCMais/node-libcurl/compare/v2.2.0...v2.3.0
 [2.2.0]: https://github.com/JCMais/node-libcurl/compare/v2.1.3...v2.2.0

diff --git a/LIBCURL_VERSION_WIN_DEPS b/LIBCURL_VERSION_WIN_DEPS
@@ -1 +1 @@
-curl-7_73_0-2
+curl-7_73_0-3
diff --git a/deps/curl-for-windows b/deps/curl-for-windows
diff --git a/scripts/ci/build-libcurl.sh b/scripts/ci/build-libcurl.sh
@@ -33,6 +33,8 @@ OPENLDAP_BUILD_FOLDER=${OPENLDAP_BUILD_FOLDER:-}
 LIBSSH2_BUILD_FOLDER=${LIBSSH2_BUILD_FOLDER:-}
 NGHTTP2_BUILD_FOLDER=${NGHTTP2_BUILD_FOLDER:-}
 OPENSSL_BUILD_FOLDER=${OPENSSL_BUILD_FOLDER:-}
+CARES_BUILD_FOLDER=${CARES_BUILD_FOLDER:-}
+BROTLI_BUILD_FOLDER=${BROTLI_BUILD_FOLDER:-}
 ZLIB_BUILD_FOLDER=${ZLIB_BUILD_FOLDER:-}
 
 LIBS=${LIBS:-}

diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
@@ -54,12 +54,13 @@ GSS_LIBRARY=${GSS_LIBRARY:-kerberos}
 ###################
 # Build cares
 ###################
-CARES_RELEASE=${CARES_RELEASE:-$(node -e "console.log(process.versions.ares || '1.16.1')")}
-CARES_DEST_FOLDER=$PREFIX_DIR/deps/cares
-echo "Building cares v$CARES_RELEASE"
-./scripts/ci/build-cares.sh $CARES_RELEASE $CARES_DEST_FOLDER >/dev/null
-export CARES_BUILD_FOLDER=$CARES_DEST_FOLDER/build/$CARES_RELEASE
-ls -al $CARES_BUILD_FOLDER/lib
+# c-ares is disabled at the moment due to this: https://github.com/JCMais/node-libcurl/issues/280
+# CARES_RELEASE=${CARES_RELEASE:-$(node -e "console.log(process.versions.ares || '1.16.1')")}
+# CARES_DEST_FOLDER=$PREFIX_DIR/deps/cares
+# echo "Building cares v$CARES_RELEASE"
+# ./scripts/ci/build-cares.sh $CARES_RELEASE $CARES_DEST_FOLDER >/dev/null
+# export CARES_BUILD_FOLDER=$CARES_DEST_FOLDER/build/$CARES_RELEASE
+# ls -al $CARES_BUILD_FOLDER/lib
 
 ###################
 # Build libunistring