Skip to content

Commit 68505a0

Browse files
electron-roller[bot]patchup[bot]codebytere
authored andcommitted
chore: bump node to v18.18.2 (main) (electron#40205)
* chore: bump node in DEPS to v18.18.2 * chore: update patches * deps: update nghttp2 to 1.55.0 nodejs/node#48746 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent 0b847b0 commit 68505a0

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

DEPS

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'120.0.6099.5',
66
'node_version':
7-
'v18.18.0',
7+
'v18.18.2',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

patches/node/build_add_gn_build_files.patch

+6-3
Original file line numberDiff line numberDiff line change
@@ -849,10 +849,10 @@ index 0000000000000000000000000000000000000000..fb000f8ee7647c375bc190d1729d67bb
849849
+}
850850
diff --git a/deps/nghttp2/BUILD.gn b/deps/nghttp2/BUILD.gn
851851
new file mode 100644
852-
index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655af7a9a1d
852+
index 0000000000000000000000000000000000000000..7d2ca477db2415f43ababa270d8aefa3124b2765
853853
--- /dev/null
854854
+++ b/deps/nghttp2/BUILD.gn
855-
@@ -0,0 +1,48 @@
855+
@@ -0,0 +1,51 @@
856856
+config("nghttp2_config") {
857857
+ defines = [ "NGHTTP2_STATICLIB" ]
858858
+ include_dirs = [ "lib/includes" ]
@@ -894,11 +894,14 @@ index 0000000000000000000000000000000000000000..23eed033d31eced6a85c794eee550655
894894
+ "lib/nghttp2_pq.c",
895895
+ "lib/nghttp2_priority_spec.c",
896896
+ "lib/nghttp2_queue.c",
897+
+ "lib/nghttp2_ratelim.c",
897898
+ "lib/nghttp2_rcbuf.c",
898899
+ "lib/nghttp2_session.c",
899900
+ "lib/nghttp2_stream.c",
900901
+ "lib/nghttp2_submit.c",
902+
+ "lib/nghttp2_time.c",
901903
+ "lib/nghttp2_version.c",
904+
+ "lib/sfparse.c"
902905
+ ]
903906
+}
904907
diff --git a/deps/simdutf/BUILD.gn b/deps/simdutf/BUILD.gn
@@ -2100,7 +2103,7 @@ index 0000000000000000000000000000000000000000..4ab828dcbf322a9e28674e48c4a6868b
21002103
+ args = rebase_path(inputs + outputs, root_build_dir)
21012104
+}
21022105
diff --git a/src/node_version.h b/src/node_version.h
2103-
index 7e90c796f3bd076048a2114a1ba31db7ee876440..60a17104e0b1b19038efc1a1468ee92642d3ffd6 100644
2106+
index 88cc915177bcf8b86eb8f9f16b215cb6d06b3aa7..8df52c22dd76a850d421075effc44fbfb32307db 100644
21042107
--- a/src/node_version.h
21052108
+++ b/src/node_version.h
21062109
@@ -89,7 +89,10 @@

0 commit comments

Comments
 (0)