From 7e484a26c1f9d6857509d0a3e869611213c48d0c Mon Sep 17 00:00:00 2001 From: jackkav Date: Wed, 11 Oct 2023 14:34:30 +0200 Subject: [PATCH 1/8] node 18.17.1 electron 27 --- .github/workflows/build-and-release.yaml | 12 ++++++------ .github/workflows/build-lint-test.yaml | 14 +++++++------- .github/workflows/publish.yaml | 2 +- package.json | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml index 24a153d83..4bc83063f 100644 --- a/.github/workflows/build-and-release.yaml +++ b/.github/workflows/build-and-release.yaml @@ -31,7 +31,7 @@ jobs: node-libcurl-cpp-std: - c++17 node: - - 18.16.1 + - 18.17.1 env: LIBCURL_RELEASE: ${{ matrix.libcurl-release }} @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/build-lint-test.yaml b/.github/workflows/build-lint-test.yaml index 02e03350b..d695b9e87 100644 --- a/.github/workflows/build-lint-test.yaml +++ b/.github/workflows/build-lint-test.yaml @@ -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 @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index c311a8dc9..2224f51d1 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -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 diff --git a/package.json b/package.json index b442eac7e..9e08e5507 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.3.6-19", + "version": "2.3.6-271", "description": "The fastest http(s) client (and much more) for Node.js - Node.js bindings for libcurl", "keywords": [ "node-curl", From 55818353e602650925024cc724f45d5fd757fc41 Mon Sep 17 00:00:00 2001 From: jackkav Date: Wed, 11 Oct 2023 15:37:42 +0200 Subject: [PATCH 2/8] mac version bump --- README.md | 4 +++- binding.gyp | 6 +++--- scripts/ci/build-brotli.sh | 2 +- scripts/ci/build-libcurl.sh | 8 ++++---- scripts/ci/build.sh | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index e751a7190..3909facd8 100644 --- a/README.md +++ b/README.md @@ -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 ) - 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 @@ -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: diff --git a/binding.gyp b/binding.gyp index a5e6ff830..8191678ef 100644 --- a/binding.gyp +++ b/binding.gyp @@ -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%': '', @@ -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': { @@ -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++'], diff --git a/scripts/ci/build-brotli.sh b/scripts/ci/build-brotli.sh index c12724f34..6a78cf6a1 100755 --- a/scripts/ci/build-brotli.sh +++ b/scripts/ci/build-brotli.sh @@ -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="" diff --git a/scripts/ci/build-libcurl.sh b/scripts/ci/build-libcurl.sh index b7390a8a4..f5c09094c 100755 --- a/scripts/ci/build-libcurl.sh +++ b/scripts/ci/build-libcurl.sh @@ -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 @@ -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") @@ -275,7 +275,7 @@ export LDFLAGS=$LDFLAGS --prefix=$build_folder \ "${libcurl_args[@]}" \ "${@:3}" - + # Release - Both diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 60ee3f1ca..2485af380 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -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" From 7a3a86ab5048d1709b34b2a23ff5906cebb64a48 Mon Sep 17 00:00:00 2001 From: jackkav Date: Thu, 12 Oct 2023 09:14:37 +0200 Subject: [PATCH 3/8] bump deps --- README.md | 6 +++--- scripts/ci/build.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 3909facd8..d5abf2cd9 100644 --- a/README.md +++ b/README.md @@ -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) @@ -458,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 diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 2485af380..bb2a9c6e5 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -177,7 +177,7 @@ 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_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" @@ -210,7 +210,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 From c90371db076baca61c11b3dc325ffccad481e856 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 12 Oct 2023 09:28:14 +0100 Subject: [PATCH 4/8] comment out brotli from node version --- scripts/ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index bb2a9c6e5..5a697ed2f 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -176,7 +176,7 @@ 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_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 From 7e0c126944ae82cb148c76acc5307da0edaf0f6f Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 12 Oct 2023 11:30:29 +0100 Subject: [PATCH 5/8] force zlib to 1.2.13 --- scripts/ci/build.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 5a697ed2f..013ab5d5c 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -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 From 959719a9635169c52b273a0a882045984da353c5 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 12 Oct 2023 11:43:33 +0100 Subject: [PATCH 6/8] typo --- scripts/ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 013ab5d5c..2281a87e3 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -190,7 +190,7 @@ ls -al $BROTLI_BUILD_FOLDER/lib ################### # Zlib version must match Node.js one #ZLIB_RELEASE=${ZLIB_RELEASE:-$(node -e "console.log(process.versions.zlib)")} -ZLIB_RELEASE=${ZLIB_RELEASE:-1.2.13")} +ZLIB_RELEASE=${ZLIB_RELEASE:-1.2.13)} ZLIB_DEST_FOLDER=$PREFIX_DIR/deps/zlib echo "Building zlib v$ZLIB_RELEASE" From 75dd360ef565c33124fb7ea73613860bef82b601 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 12 Oct 2023 12:39:00 +0100 Subject: [PATCH 7/8] typo --- scripts/ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh index 2281a87e3..a7ec3e76b 100755 --- a/scripts/ci/build.sh +++ b/scripts/ci/build.sh @@ -190,7 +190,7 @@ ls -al $BROTLI_BUILD_FOLDER/lib ################### # Zlib version must match Node.js one #ZLIB_RELEASE=${ZLIB_RELEASE:-$(node -e "console.log(process.versions.zlib)")} -ZLIB_RELEASE=${ZLIB_RELEASE:-1.2.13)} +ZLIB_RELEASE=${ZLIB_RELEASE:-1.2.13} ZLIB_DEST_FOLDER=$PREFIX_DIR/deps/zlib echo "Building zlib v$ZLIB_RELEASE" From df3e5d27fae8b1e724e122cea5e96311c7efda29 Mon Sep 17 00:00:00 2001 From: Filipe Freire Date: Thu, 12 Oct 2023 13:28:22 +0100 Subject: [PATCH 8/8] tag 2.3.6-21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9e08e5507..e8c713cd1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@getinsomnia/node-libcurl", - "version": "2.3.6-271", + "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",