[ci] Update latest version of node v24. NFC

We can now use this for testing wasm64 and esm integration.

Author: sbc100

.circleci/config.yml

@@ -108,7 +108,7 @@ commands:
     description: "install latest version of node"
     steps:
       - install-node-version:
-         node_version: "19.0.0"
+         node_version: "24.1.0"
   install-node-canary:
     description: "install canary version of node"
     steps:
@@ -670,7 +670,7 @@ jobs:
       # hardcodes /root into its launcher scripts so we need to reinstall v8.
       - run: rm -rf $HOME/.jsvu
       - install-v8
-      - install-node-canary
+      - install-node-latest
       - run-tests:
           title: "esm_integration"
           test_targets: "esm_integration"
@@ -692,7 +692,7 @@ jobs:
       # hardcodes /root into its launcher scripts so we need to reinstall v8.
       - run: rm -rf $HOME/.jsvu
       - install-v8
-      - install-node-canary
+      - install-node-latest
       # When running wasm64 tests we need to make sure we use the testing
       # version of node (node canary) when running the compiler output (e.g.
       # in configure tests.
@@ -717,7 +717,7 @@ jobs:
       # hardcodes /root into its launcher scripts so we need to reinstall v8.
       - run: rm -rf $HOME/.jsvu
       - install-v8
-      - install-node-canary
+      - install-node-latest
       # When running wasm64 tests we need to make sure we use the testing
       # version of node (node canary) when running the compiler output (e.g.
       # in configure tests.

test/common.py

@@ -1038,12 +1038,8 @@ def require_wasm64(self):
     if self.is_browser_test():
       return
 
-    nodejs = self.get_nodejs()
-    if nodejs:
-      version = shared.get_node_version(nodejs)
-      if version >= (24, 0, 0):
-        self.js_engines = [nodejs]
-        return
+    if self.try_require_node_version((24, 0, 0)):
+      return
 
     if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
       self.emcc_args.append('-sENVIRONMENT=shell')
@@ -1055,16 +1051,33 @@ def require_wasm64(self):
     else:
       self.fail('either d8 or node >= 24 required to run wasm64 tests.  Use EMTEST_SKIP_WASM64 to skip')
 
+  def try_require_node_version(self, required_version):
+    nodejs = self.get_nodejs()
+    if not nodejs:
+      self.skipTest('Test requires nodejs to run')
+    version = shared.get_node_version(nodejs)
+    if version < required_version:
+      return False
+
+    self.js_engines = [nodejs]
+    return True
+
+  def require_node_version(self, required_version, name):
+    if self.is_browser_test():
+      return
+
+    if not self.try_require_node_version(required_version):
+      if f'EMTEST_SKIP_{name}' in os.environ:
+        self.skipTest(f'test requires node {required_version} and EMTEST_SKIP_{name} is set')
+      else:
+        self.fail(f'node canary required to run this test.  Use EMTEST_SKIP_{name} to skip')
+
   def require_simd(self):
     if self.is_browser_test():
       return
 
-    nodejs = self.get_nodejs()
-    if nodejs:
-      version = shared.get_node_version(nodejs)
-      if version >= (16, 0, 0):
-        self.js_engines = [nodejs]
-        return
+    if self.try_require_node_version((16, 0, 0)):
+      return
 
     if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
       self.emcc_args.append('-sENVIRONMENT=shell')
@@ -1079,11 +1092,8 @@ def require_simd(self):
   def require_wasm_legacy_eh(self):
     self.set_setting('WASM_LEGACY_EXCEPTIONS')
     nodejs = self.get_nodejs()
-    if nodejs:
-      version = shared.get_node_version(nodejs)
-      if version >= (17, 0, 0):
-        self.js_engines = [nodejs]
-        return
+    if self.try_require_node_version((17, 0, 0)):
+      return
 
     if config.V8_ENGINE and config.V8_ENGINE in self.js_engines:
       self.emcc_args.append('-sENVIRONMENT=shell')

test/test_core.py

@@ -409,7 +409,7 @@ def should_use_closure(self):
     return all(f not in self.emcc_args for f in prohibited) and any(f in self.emcc_args for f in required)
 
   def setup_esm_integration(self):
-    self.require_node_canary()
+    self.require_node_version((24, 0, 0), 'NODE24')
     self.node_args += ['--experimental-wasm-modules', '--no-warnings']
     self.set_setting('WASM_ESM_INTEGRATION')
     self.emcc_args += ['-Wno-experimental']