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++
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<T>::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>(callback), type);
+#if __clang__
+#pragma clang diagnostic pop
+#endif
 #if (__GNUC__ >= 8) && !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif