Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
node-libcurl-cpp-std:
- c++17
node:
- 18.16.1
- 18.17.1

env:
LIBCURL_RELEASE: ${{ matrix.libcurl-release }}
Expand Down Expand Up @@ -109,9 +109,9 @@ jobs:
libcurl-release:
- 7.79.1
node:
- 18.16.1
- 18.17.1
electron-version:
- 26.0.0
- 27.0.0
env:
LIBCURL_RELEASE: ${{ matrix.libcurl-release }}
LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }}
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
fail-fast: false
matrix:
node:
- 18.16.1
- 18.17.1
env:
npm_config_msvs_version: 2022
npm_config_build_from_source: true
Expand Down Expand Up @@ -234,9 +234,9 @@ jobs:
fail-fast: false
matrix:
node:
- 18.16.1
- 18.17.1
electron-version:
- 26.0.0
- 27.0.0
env:
ELECTRON_VERSION: ${{ matrix.electron-version }}
npm_config_msvs_version: 2022
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/build-lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
node-libcurl-cpp-std:
- c++17
node:
- 18.16.1
- 18.17.1
include:
# Lint
- os: ubuntu-latest
node: 18.16.1
node: 18.17.1
node-libcurl-cpp-std: c++17
libcurl-release: 7.79.1
run-lint-and-tsc: true
Expand Down Expand Up @@ -144,9 +144,9 @@ jobs:
libcurl-release:
- 7.79.1
node:
- 18.16.1
- 18.17.1
electron-version:
- 26.0.0
- 27.0.0
env:
LIBCURL_RELEASE: ${{ matrix.libcurl-release }}
LATEST_LIBCURL_RELEASE: ${{ matrix.libcurl-release }}
Expand Down Expand Up @@ -244,7 +244,7 @@ jobs:
fail-fast: false
matrix:
node:
- 18.16.1
- 18.17.1
env:
npm_config_msvs_version: 2022
npm_config_build_from_source: true
Expand Down Expand Up @@ -281,9 +281,9 @@ jobs:
fail-fast: false
matrix:
node:
- 18.16.1
- 18.17.1
electron-version:
- 26.0.0
- 27.0.0
env:
ELECTRON_VERSION: ${{ matrix.electron-version }}
npm_config_msvs_version: 2022
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js ${{ matrix.node }}
uses: actions/setup-node@v3
with:
node-version: 18.16.1
node-version: 18.17.1
registry-url: 'https://registry.npmjs.org'
- name: Install
run: yarn install --ignore-scripts
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
- [Electron >= 11 / NW.js >= 0.50](#electron--11--nwjs--050)
- [Building on Linux](#building-on-linux)
- [Building on macOS](#building-on-macos)
- [Xcode >= 10 | macOS >= Mojave](#xcode--10--macos--mojave)
- [Xcode >= 10 | macOS >= Catalina](#xcode--10--macos--catalina)
- [Building on Windows](#building-on-windows)
- [Getting Help](#getting-help)
- [Contributing](#contributing)
Expand Down Expand Up @@ -271,11 +271,13 @@ The maintainers of node-libcurl and thousands of other packages are working with

The latest version of this package has prebuilt binaries (thanks to [node-pre-gyp](https://github.com/mapbox/node-pre-gyp/))
available for:

- Node.js: Latest two versions on active LTS (see <https://github.com/nodejs/Release>)
- Electron: Latest 3 major versions
- NW.js (node-webkit): Latest 3 major (minor for nw.js case) versions

And on the following platforms:

- Linux 64 bits
- Mac OS X 64 bits
- Windows 32 and 64 bits
Expand Down Expand Up @@ -441,7 +443,7 @@ In case you want some examples check the CI configuration files ([`.travis.yml`]

On macOS you must have:

- macOS >= 10.12 (Sierra)
- macOS >= 10.15 (Catalina)
- Xcode Command Line Tools

You can check if you have Xcode Command Line Tools be running:
Expand All @@ -456,9 +458,9 @@ It should return their path, in case it returns nothing, you must install it by
xcode-select --install
```

#### Xcode >= 10 | macOS >= Mojave
#### Xcode >= 10 | macOS >= Catalina

In case you have errors installing the addon from source, and you are using macOS version >= Mojave, check if the error you are receiving is the following one:
In case you have errors installing the addon from source, and you are using macOS version >= Catalina, check if the error you are receiving is the following one:

```
CXX(target) Release/obj.target/node_libcurl/src/node_libcurl.o
Expand Down
6 changes: 3 additions & 3 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# npm install --curl-extra_link_args=true
# or if using yarn:
# npm_config_curl_extra_link_args=true yarn install
#
#
'variables': {
# Comma separated list
'curl_include_dirs%': '',
Expand Down Expand Up @@ -61,7 +61,7 @@
'libraries': ['<@(curl_libraries)']
}],
# Windows is only build statically
# In the future we can add support for other build types
# In the future we can add support for other build types
['OS=="win"', {
'msvs_settings': {
'VCCLCompilerTool': {
Expand Down Expand Up @@ -238,7 +238,7 @@
],
'GCC_ENABLE_CPP_RTTI': 'YES',
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
'MACOSX_DEPLOYMENT_TARGET':'10.12',
'MACOSX_DEPLOYMENT_TARGET':'10.15',
'CLANG_CXX_LIBRARY': 'libc++',
'CLANG_CXX_LANGUAGE_STANDARD':'<(node_libcurl_cpp_std)',
'OTHER_LDFLAGS': ['-stdlib=libc++'],
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@getinsomnia/node-libcurl",
"version": "2.3.6-19",
"version": "2.3.6-21",
"description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl",
"keywords": [
"node-curl",
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/build-brotli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ mkdir -p out && cd out

# Release - Static

# We set those to -mmacosx-version-min=10.12 by default on macOS
# We set those to -mmacosx-version-min=10.15 by default on macOS
# But cmake does not like it
if [ "$(uname)" == "Darwin" ]; then
export CFLAGS=""
Expand Down
8 changes: 4 additions & 4 deletions scripts/ci/build-libcurl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ if [ ! -z "$KERBEROS_BUILD_FOLDER" ]; then
# and even if it did, it would return more flags than needed
# because the bin there is built with shared libraries:
# -L/Users/jcm/deps/kerberos/build/1.17/lib -dynamic \
# -mmacosx-version-min=10.12 -L/Users/jcm/deps/openssl/build/1.1.0j/lib \
# -mmacosx-version-min=10.15 -L/Users/jcm/deps/openssl/build/1.1.0j/lib \
# -Wl,-rpath,/Users/jcm/deps/openssl/build/1.1.0j/lib -Wl,-search_paths_first \
# -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
# Currently it only links against -lgssapi_krb5 -lresolv
Expand All @@ -167,8 +167,8 @@ if [ ! -z "$KERBEROS_BUILD_FOLDER" ]; then
# libcurl only links against -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
LIBS="-lkrb5support -lresolv $LIBS"
fi


elif [ ! -z "$HEIMDAL_BUILD_FOLDER" ]; then

libcurl_args+=("--with-gssapi=$HEIMDAL_BUILD_FOLDER")
Expand Down Expand Up @@ -275,7 +275,7 @@ export LDFLAGS=$LDFLAGS
--prefix=$build_folder \
"${libcurl_args[@]}" \
"${@:3}"

# Release - Both


Expand Down
12 changes: 7 additions & 5 deletions scripts/ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ "$(uname)" == "Darwin" ]; then
export MACOS_ARCH_FLAGS=""
fi

export MACOSX_DEPLOYMENT_TARGET=10.12
export MACOSX_DEPLOYMENT_TARGET=10.15
export MACOS_TARGET_FLAGS="-mmacosx-version-min=$MACOSX_DEPLOYMENT_TARGET"

export CFLAGS="$MACOS_TARGET_FLAGS $MACOS_ARCH_FLAGS"
Expand Down Expand Up @@ -176,8 +176,8 @@ fi
###################
# Brotli version must match Node.js one
# But brotli only started being shipped with Node 12
BROTLI_NODEJS=$(node -e "console.log(process.versions.brotli || '')")
BROTLI_DEFAULT_RELEASE=${BROTLI_NODEJS:-1.0.7}
# BROTLI_NODEJS=$(node -e "console.log(process.versions.brotli || '')")
BROTLI_DEFAULT_RELEASE=${BROTLI_NODEJS:-1.0.9}
BROTLI_RELEASE=${BROTLI_RELEASE:-$BROTLI_DEFAULT_RELEASE}
BROTLI_DEST_FOLDER=$PREFIX_DIR/deps/brotli
echo "Building brotli v$BROTLI_RELEASE"
Expand All @@ -189,7 +189,9 @@ ls -al $BROTLI_BUILD_FOLDER/lib
# Build zlib
###################
# Zlib version must match Node.js one
ZLIB_RELEASE=${ZLIB_RELEASE:-$(node -e "console.log(process.versions.zlib)")}
#ZLIB_RELEASE=${ZLIB_RELEASE:-$(node -e "console.log(process.versions.zlib)")}
ZLIB_RELEASE=${ZLIB_RELEASE:-1.2.13}

ZLIB_DEST_FOLDER=$PREFIX_DIR/deps/zlib
echo "Building zlib v$ZLIB_RELEASE"
./scripts/ci/build-zlib.sh $ZLIB_RELEASE $ZLIB_DEST_FOLDER >$LOGS_FOLDER/build-zlib.log 2>&1
Expand All @@ -210,7 +212,7 @@ ls -al $ZSTD_BUILD_FOLDER/lib
###################
# Build libssh2
###################
LIBSSH2_RELEASE=${LIBSSH2_RELEASE:-1.10.0}
LIBSSH2_RELEASE=${LIBSSH2_RELEASE:-1.11.0}
LIBSSH2_DEST_FOLDER=$PREFIX_DIR/deps/libssh2
echo "Building libssh2 v$LIBSSH2_RELEASE"
./scripts/ci/build-libssh2.sh $LIBSSH2_RELEASE $LIBSSH2_DEST_FOLDER >$LOGS_FOLDER/build-libssh2.log 2>&1
Expand Down