From e63ff6fbef3fc702e9476240801cf2fbce52db6e Mon Sep 17 00:00:00 2001 From: Chengzhong Wu Date: Mon, 30 Jun 2025 11:51:34 +0100 Subject: [PATCH 1/2] deps: V8: backport 493cb53691be Original commit message: [include] suppress clang cast-function-type-mismatch warning on SetWeak Suppress clang warning cast-function-type-mismatch in embedder calls to `SetWeak`. Change-Id: I6c4eda1b932199a2ea4947fe851ffdf2ae04ad73 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6689209 Reviewed-by: Camillo Bruni Commit-Queue: Chengzhong Wu Cr-Commit-Position: refs/heads/main@{#101186} Ignore `cast-function-type` instead of `cast-function-type-mismatch` for compatibility with older versions of Clang. Refs: https://github.com/v8/v8/commit/493cb53691bedf02f5786fe26608199ec5693ba1 --- common.gypi | 2 +- deps/v8/include/v8-persistent-handle.h | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/common.gypi b/common.gypi index e89330a1045d0c..7e3a6da67b2ddd 100644 --- a/common.gypi +++ b/common.gypi @@ -38,7 +38,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.16', + 'v8_embedder_string': '-node.17', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/include/v8-persistent-handle.h b/deps/v8/include/v8-persistent-handle.h index 6abe29d4ab782f..d08412fbd05dc4 100644 --- a/deps/v8/include/v8-persistent-handle.h +++ b/deps/v8/include/v8-persistent-handle.h @@ -488,9 +488,16 @@ V8_INLINE void PersistentBase::SetWeak( #if (__GNUC__ >= 8) && !defined(__clang__) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wcast-function-type" +#endif +#if __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wcast-function-type" #endif api_internal::MakeWeak(this->slot(), parameter, reinterpret_cast(callback), type); +#if __clang__ +#pragma clang diagnostic pop +#endif #if (__GNUC__ >= 8) && !defined(__clang__) #pragma GCC diagnostic pop #endif From 9acacd33052962024e2c1a5e33463f00480307f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 27 Jul 2025 09:23:25 +0200 Subject: [PATCH 2/2] build: update macOS runner and Xcode Xcode 16.4 will be required for Node.js 25. macOS 15 is required for Xcode 16.4. Refs: https://github.com/nodejs/node/issues/58069 Co-authored-by: Yagiz Nizipli --- .github/workflows/test-macos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index c74e200acb0295..053c5c7f4d4063 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -30,7 +30,7 @@ concurrency: env: PYTHON_VERSION: '3.12' - XCODE_VERSION: '16.1' + XCODE_VERSION: '16.4' FLAKY_TESTS: keep_retrying permissions: @@ -41,7 +41,7 @@ jobs: if: github.event.pull_request.draft == false strategy: fail-fast: false - runs-on: macos-14 + runs-on: macos-15 env: CC: sccache gcc CXX: sccache g++