[GR-54053] Backport to 24.0: Re-enable jdk-latest jobs on darwin-amd64 and move to macOS BigSur.

PullRequest: js/3165

Author: kassifar

ci.jsonnet

@@ -96,7 +96,7 @@ local graalNodeJs = import 'graal-nodejs/ci.jsonnet';
     common.jdk21 + common.windows_amd64,
     common.jdklatest + common.linux_amd64,
     common.jdklatest + common.linux_aarch64,
-    #common.jdklatest + common.darwin_amd64, # GR-50122
+    common.jdklatest + common.darwin_amd64,
     common.jdklatest + common.darwin_aarch64,
     common.jdklatest + common.windows_amd64,
   ],

common.jsonnet

@@ -74,10 +74,9 @@ targets +
 
   darwin_amd64:: common.darwin_amd64 + self.darwin_common + {
     environment+: {
-      // for compatibility with macOS High Sierra
-      MACOSX_DEPLOYMENT_TARGET: '10.13',
+      // for compatibility with macOS BigSur
+      MACOSX_DEPLOYMENT_TARGET: '11.0',
     },
-    capabilities+: ['darwin_mojave'],
   },
 
   darwin_aarch64:: common.darwin_aarch64 + self.darwin_common + {

graal-js/ci.jsonnet

@@ -131,7 +131,7 @@ local ci = import '../ci.jsonnet';
       promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.linux_aarch64, common.jdklatest + common.windows_amd64]),
     graalJs + gateTags('default')                                                                    + ee + {name: 'default-ee'} +
       promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.darwin_aarch64]) +
-      promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
+      promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
 
     graalJs + gateTags('noic')                                                                            + {name: 'noic'} + gateOnMain,
     graalJs + gateTags('directbytebuffer')                                                                + {name: 'directbytebuffer'} + gateOnMain,

graal-nodejs/ci.jsonnet

@@ -152,12 +152,12 @@ local cicommon = import '../ci/common.jsonnet';
   local testingBuilds = generateBuilds([
     graalNodeJs          + build            + defaultGateTags          + {dynamicimports+:: ['/wasm']}                             + {name: 'default'} +
       promoteToTarget(common.gate, [common.jdklatest + common.linux_amd64, common.jdklatest + common.linux_aarch64, common.jdklatest + common.darwin_aarch64, common.jdklatest + common.windows_amd64]) +
-      promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
+      promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
 
     graalNodeJs + vm_env + build            + gateVmSmokeTest                                                                 + ce + {name: 'graalvm-ce'} +
       promoteToTarget(common.gate, [ci.mainGatePlatform]) +
       promoteToTarget(common.gate, [common.jdklatest + common.darwin_aarch64, common.jdklatest + common.windows_amd64]) +
-      promoteToTarget(common.postMerge, [common.jdk21 + common.darwin_amd64]),
+      promoteToTarget(common.postMerge, [common.jdklatest + common.darwin_amd64]),
     graalNodeJs + vm_env + build            + gateVmSmokeTest                                                                 + ee + {name: 'graalvm-ee'} +
       promoteToTarget(common.gate, [ci.mainGatePlatform]),
 

graal-nodejs/deps/ada/ada.cpp

@@ -10422,11 +10422,7 @@ ada_warn_unused std::string to_string(ada::encoding_type type) {
 /* begin file src/helpers.cpp */
 
 #include <algorithm>
-#if __has_include(<charconv>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #include <charconv>
-#else
-#include "charconv_shim.h"
-#endif
 #include <cstring>
 #include <sstream>
 

graal-nodejs/deps/ada/ada.h

@@ -5064,11 +5064,7 @@ ada_really_inline constexpr bool verify_dns_length(
 
 
 #include <algorithm>
-#if __has_include(<charconv>) && (!defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500)
 #include <charconv>
-#else
-#include "charconv_shim.h"
-#endif
 #include <iostream>
 #include <optional>
 #include <string>