diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index e1e83eb89..3509a07a8 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -7,6 +7,7 @@ on: pull_request: branches: - '**' + workflow_dispatch: env: PRIMARY_NODE_VERSION: 20 diff --git a/binding.gyp b/binding.gyp index 539b433b6..1d3c3472c 100644 --- a/binding.gyp +++ b/binding.gyp @@ -30,7 +30,7 @@ ], 'libraries': [ '-L<(build_dir)/lib', - ' i.startsWith(\'-L\')).join(\' \').replace(/-L/g, \'\'))")' + ' i.startsWith(\'-L\')).join(\' \').replace(/-L/g, \'\'))")' ], }, }], diff --git a/deps/curl-impersonate b/deps/curl-impersonate index a9729a481..21a00e623 160000 --- a/deps/curl-impersonate +++ b/deps/curl-impersonate @@ -1 +1 @@ -Subproject commit a9729a48134437e90dd450c760495c0c3ea8d6a4 +Subproject commit 21a00e6231bcca4060c5df53d4443e722f56e269 diff --git a/scripts/build.sh b/scripts/build.sh index aa5c8e02f..d718d7f3a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -9,14 +9,14 @@ SRC_ARTIFACTS_FILE="$BUILD_DIR/curl-impersonate.src.tar.gz" BUILD_ARTIFACTS_FILE="$BUILD_DIR/curl-impersonate.tar.gz" OS=$(uname -s) -BORINGSSL_COMMIT="23768dca563c4e62d48bb3675e49e34955dced12" +BORINGSSL_COMMIT="673e61fc215b178a90c0e67858bbf162c8158993" BORINGSSL_SRC_DIR="$BUILD_DIR/boringssl-$BORINGSSL_COMMIT" BROTLI_VERSION="1.1.0" BROTLI_SRC_DIR="$BUILD_DIR/brotli-$BROTLI_VERSION" BROTLI_OUT_DIR="$BROTLI_SRC_DIR/out/installed" -CURL_VERSION="8_7_1" +CURL_VERSION="8_13_0" CURL_SRC_DIR="$BUILD_DIR/curl-$CURL_VERSION" CURL_OUT_DIR="$BUILD_DIR/curl-impersonate" @@ -48,7 +48,7 @@ fi # Build BoringSSL build_boringssl() { - $MAKE chrome-build + $MAKE build } # Build zlib @@ -117,9 +117,9 @@ configure_build() { # Build Curl Impersonate build_curl_impersonate() { - $MAKE chrome-build - $MAKE chrome-checkbuild - $MAKE chrome-install + $MAKE build + $MAKE checkbuild + $MAKE install # copy curl include dir mkdir -p "$CURL_OUT_DIR/include" @@ -168,6 +168,7 @@ main() { # Create install directory mkdir -p "$BUILD_DIR" cd "$BUILD_DIR" + export CFLAGS="-fPIC" # Build zlib echo "Building zlib..." diff --git a/scripts/install.sh b/scripts/install.sh index d021ac500..352048230 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -2,7 +2,7 @@ set -euo pipefail cd "$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" && pwd -P)/.." -CURL_IMPERSONATE_VERSION="0.9.4" +CURL_IMPERSONATE_VERSION="1.0.0" # no action required if binding exists if [[ -f lib/binding/node_libcurl_ja3.node ]]; then