diff --git a/package.json b/package.json index 1cca97853..294c1c772 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.4.1-5", + "version": "2.4.1-8-alpha.2", "description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl", "keywords": [ "node-curl", diff --git a/scripts/ci/build-libcurl.sh b/scripts/ci/build-libcurl.sh index 0b2680839..45b5a6ec7 100755 --- a/scripts/ci/build-libcurl.sh +++ b/scripts/ci/build-libcurl.sh @@ -15,6 +15,11 @@ mkdir -p $2/source FORCE_REBUILD=${FORCE_REBUILD:-} FORCE_REBUILD_LIBCURL=${FORCE_REBUILD_LIBCURL:-} +# has a cache issue which will skip the rebuild of libcurl +if [ "${RUNNER_OS}" == "macOS" ]; then + FORCE_REBUILD_LIBCURL="true" +fi + # @TODO We are explicitly checking the static lib if [[ -f $build_folder/lib/libcurl.a ]] && [[ -z $FORCE_REBUILD || $FORCE_REBUILD != "true" ]] && [[ -z $FORCE_REBUILD_LIBCURL || $FORCE_REBUILD_LIBCURL != "true" ]]; then echo "Skipping rebuild of libcurl because lib file already exists" @@ -134,13 +139,15 @@ fi ##### # ssl #### -if [ "${RUNNER_OS}" == "macOS" ]; then - libcurl_args+=("--with-secure-transport") -elif [ ! -z "$OPENSSL_BUILD_FOLDER" ]; then +if [ ! -z "$OPENSSL_BUILD_FOLDER" ]; then CPPFLAGS="$CPPFLAGS -I$OPENSSL_BUILD_FOLDER/include" LDFLAGS="$LDFLAGS -L$OPENSSL_BUILD_FOLDER/lib -Wl,-rpath,$OPENSSL_BUILD_FOLDER/lib" libcurl_args+=("--with-ssl=$OPENSSL_BUILD_FOLDER") + if [ "${RUNNER_OS}" == "macOS" ]; then + libcurl_args+=("--with-secure-transport") + libcurl_args+=("--with-default-ssl-backend=openssl") + fi else libcurl_args+=("--without-ssl") fi