From 8346181ad3050de2af238fda73bc576ff0cd7502 Mon Sep 17 00:00:00 2001 From: Antoine du Hamel Date: Thu, 4 Jun 2026 00:17:32 +0200 Subject: [PATCH 1/2] tools: fix zlib updater script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Antoine du Hamel PR-URL: https://github.com/nodejs/node/pull/63707 Reviewed-By: Marco Ippolito Reviewed-By: Tobias Nießen Reviewed-By: Luigi Pinca --- tools/dep_updaters/update-zlib.sh | 45 +++++++++++++++---------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/tools/dep_updaters/update-zlib.sh b/tools/dep_updaters/update-zlib.sh index 3b9129fe3bbfa4..b47f1dc4855922 100755 --- a/tools/dep_updaters/update-zlib.sh +++ b/tools/dep_updaters/update-zlib.sh @@ -1,5 +1,5 @@ #!/bin/sh -set -e +set -ex # Shell script to update zlib in the source tree to the most recent version. # Zlib rarely creates tags or releases, so we use the latest commit on the main branch. # See: https://github.com/nodejs/node/pull/47417 @@ -12,13 +12,13 @@ DEPS_DIR="$BASE_DIR/deps" echo "Comparing latest upstream with current revision" -git fetch https://chromium.googlesource.com/chromium/src/third_party/zlib.git HEAD +git fetch --no-tags https://chromium.googlesource.com/chromium/src/third_party/zlib.git HEAD # Revert zconf.h changes before checking diff perl -i -pe 's|^//#include "chromeconf.h"|#include "chromeconf.h"|' "$DEPS_DIR/zlib/zconf.h" git stash -- "$DEPS_DIR/zlib/zconf.h" -DIFF_TREE=$(git diff --diff-filter=d 'stash@{0}:deps/zlib' FETCH_HEAD) +DIFF_TREE=$(git diff --quiet --diff-filter=d 'stash@{0}:deps/zlib' FETCH_HEAD || echo "Changes detected") git stash drop @@ -35,7 +35,7 @@ fi # two days, we assume that the most recent commit is stable enough to be # pulled in. LAST_CHANGE_DATE=$(git log -1 --format=%ct FETCH_HEAD) -TWO_DAYS_AGO=$(date -d 'now - 2 days' '+%s') +TWO_DAYS_AGO=$(date -d '2 days ago' '+%s' 2>/dev/null || date -v-2d '+%s') if [ "$LAST_CHANGE_DATE" -gt "$TWO_DAYS_AGO" ]; then echo "Skipped because the latest version is too recent." @@ -48,32 +48,31 @@ echo "Making temporary workspace..." WORKSPACE=$(mktemp -d 2> /dev/null || mktemp -d -t 'tmp') -cd "$WORKSPACE" +cleanup () { + EXIT_CODE=$? + rm -rf "$WORKSPACE" + exit $EXIT_CODE +} -mkdir zlib +trap cleanup INT TERM EXIT -ZLIB_TARBALL="zlib-v$NEW_VERSION.tar.gz" +ZLIB_TARBALL="zlib-$LATEST_COMMIT.tar" -echo "Fetching zlib source archive" -curl -sL -o "$ZLIB_TARBALL" https://chromium.googlesource.com/chromium/src/+archive/refs/heads/main/third_party/zlib.tar.gz +echo "Packing zlib source archive" +git archive --prefix=zlib/ -o "$WORKSPACE/$ZLIB_TARBALL" --format=tar FETCH_HEAD -log_and_verify_sha256sum "zlib" "$ZLIB_TARBALL" +log_and_verify_sha256sum "zlib" "$WORKSPACE/$ZLIB_TARBALL" -gzip -dc "$ZLIB_TARBALL" | tar xf - -C zlib/ +mv "$DEPS_DIR/zlib/zlib.gyp" "$WORKSPACE/." +mv "$DEPS_DIR/zlib/win32/zlib.def" "$WORKSPACE/." -rm "$ZLIB_TARBALL" +rm -rf "$DEPS_DIR/zlib" +tar -xf "$WORKSPACE/$ZLIB_TARBALL" -C "$DEPS_DIR" --exclude='zlib/doc/' -cp "$DEPS_DIR/zlib/zlib.gyp" "$DEPS_DIR/zlib/win32/zlib.def" "$DEPS_DIR" +mv "$WORKSPACE/zlib.gyp" "$DEPS_DIR/zlib/." -rm -rf "$DEPS_DIR/zlib" zlib/.git - -mv zlib "$DEPS_DIR/" - -mv "$DEPS_DIR/zlib.gyp" "$DEPS_DIR/zlib/" - -mkdir "$DEPS_DIR/zlib/win32" - -mv "$DEPS_DIR/zlib.def" "$DEPS_DIR/zlib/win32" +mkdir -p "$DEPS_DIR/zlib/win32" +mv "$WORKSPACE/zlib.def" "$DEPS_DIR/zlib/win32/." perl -i -pe 's|^#include "chromeconf.h"|//#include "chromeconf.h"|' "$DEPS_DIR/zlib/zconf.h" @@ -82,7 +81,7 @@ VERSION_NUMBER=$(grep "#define ZLIB_VERSION" "$DEPS_DIR/zlib/zlib.h" | sed -n "s NEW_VERSION="$VERSION_NUMBER-$LATEST_COMMIT" # update version information in src/zlib_version.h -cat > "$ROOT/src/zlib_version.h" < "$BASE_DIR/src/zlib_version.h" < Date: Thu, 4 Jun 2026 02:21:26 +0200 Subject: [PATCH 2/2] src: merge `CreateEnvironment()` overloads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit API-compatible, but ABI-breaking, so done separately from the original 3090def6354af329d16. Signed-off-by: Anna Henningsen PR-URL: https://github.com/nodejs/node/pull/63596 Reviewed-By: Chengzhong Wu Reviewed-By: Yagiz Nizipli Reviewed-By: Gürgün Dayıoğlu --- src/api/environment.cc | 18 ------------------ src/node.h | 13 ++----------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/api/environment.cc b/src/api/environment.cc index c3fd1e58373516..3b94d860de1e79 100644 --- a/src/api/environment.cc +++ b/src/api/environment.cc @@ -417,24 +417,6 @@ struct InspectorParentHandleImpl : public InspectorParentHandle { }; #endif -Environment* CreateEnvironment( - IsolateData* isolate_data, - Local context, - const std::vector& args, - const std::vector& exec_args, - EnvironmentFlags::Flags flags, - ThreadId thread_id, - std::unique_ptr inspector_parent_handle) { - return CreateEnvironment(isolate_data, - context, - args, - exec_args, - flags, - thread_id, - std::move(inspector_parent_handle), - {}); -} - Environment* CreateEnvironment( IsolateData* isolate_data, Local context, diff --git a/src/node.h b/src/node.h index e25fe19c9ab30c..485037c72f31a6 100644 --- a/src/node.h +++ b/src/node.h @@ -698,17 +698,8 @@ NODE_EXTERN Environment* CreateEnvironment( const std::vector& exec_args, EnvironmentFlags::Flags flags = EnvironmentFlags::kDefaultFlags, ThreadId thread_id = {} /* allocates a thread id automatically */, - std::unique_ptr inspector_parent_handle = {}); - -NODE_EXTERN Environment* CreateEnvironment( - IsolateData* isolate_data, - v8::Local context, - const std::vector& args, - const std::vector& exec_args, - EnvironmentFlags::Flags flags, - ThreadId thread_id, - std::unique_ptr inspector_parent_handle, - std::string_view thread_name); + std::unique_ptr inspector_parent_handle = {}, + std::string_view thread_name = {}); // Returns a handle that can be passed to `LoadEnvironment()`, making the // child Environment accessible to the inspector as if it were a Node.js Worker.