[GR-51229] Backport to 23.1: Build GraalVM on Big Sur.

PullRequest: graal/16908
jerboaa · Feb 21, 2024 · 467f833 · 467f833
2 parents 68da470 + b941178
commit 467f833
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -253,7 +253,8 @@ local common_json = import "../common.json";
   },
 
   local linux   = deps_linux   + common + { os:: "linux",   capabilities+: [self.os] },
-  local darwin  = deps_darwin  + common + { os:: "darwin",  capabilities+: [self.os] },
+  # Run darwin jobs on Big Sur or later by excluding all older versions
+  local darwin  = deps_darwin  + common + { os:: "darwin",  capabilities+: [self.os, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"] },
   local windows = deps_windows + common + { os:: "windows", capabilities+: [self.os] },
   local windows_server_2016 = windows + { capabilities+: ["windows_server_2016"] },
 

diff --git a/espresso/ci/ci_common/common.jsonnet b/espresso/ci/ci_common/common.jsonnet
@@ -47,10 +47,10 @@ local benchmark_suites = ['dacapo', 'renaissance', 'scala-dacapo'];
 
   darwin_amd64: self.common + graal_common.darwin_amd64 + {
     environment+: {
-      // for compatibility with macOS High Sierra
-      MACOSX_DEPLOYMENT_TARGET: '10.13',
+      // for compatibility with macOS Big Sur
+      MACOSX_DEPLOYMENT_TARGET: '11.0',
     },
-    capabilities+: ['darwin_mojave', 'ram32gb'],
+    capabilities+: ['ram32gb'],
   },
 
   darwin_aarch64: self.common + graal_common.darwin_aarch64 + {

diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet
@@ -20,5 +20,6 @@
   builds: [
     common.linux_amd64  + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt,
     common.darwin_amd64 + common.oraclejdk21 + sdk_gate,
+    common.darwin_aarch64 + common.oraclejdk21 + sdk_gate,
   ]
 }
diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet
@@ -40,7 +40,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
     sc.weekly + $.sulong + sc.labsjdk21 + sc.linux_amd64 + sc.llvm8 + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v80-jdk21-linux-amd64" },
 
     sc.weekly + $.sulong + sc.labsjdk21 + sc.darwin_amd64 + sc.llvm4 + sc.gateTags(basicTags) + { name: "weekly-sulong-basic-nwcc-llvm-v40-jdk21-darwin-amd64", timelimit: "0:45:00" },
-    sc.gate + $.sulong + sc.labsjdk21 + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk21-darwin-amd64", timelimit: "0:45:00", capabilities+: ["!darwin_bigsur"] },
+    sc.gate + $.sulong + sc.labsjdk21 + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk21-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"] },
 
     sc.gate + $.sulong + sc.labsjdk21 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + sc.gateTags(basicTagsToolchain) + { name: "gate-sulong-basic-nwcc-llvm-toolchain-jdk21-linux-amd64" },
 

diff --git a/sulong/ci/ci_common/sulong-common.jsonnet b/sulong/ci/ci_common/sulong-common.jsonnet
@@ -78,8 +78,7 @@ local sulong_deps = common.deps.sulong;
 
   linux_amd64:: linux_amd64 + sulong_deps,
   linux_aarch64:: linux_aarch64 + sulong_deps,
-  # Avoid darwin_sierra builders in our CI. This is missing a declaration (fmemopen) that some of our tests need.
-  darwin_amd64:: darwin_amd64 + sulong_deps + { capabilities+: ["!darwin_sierra"] },
+  darwin_amd64:: darwin_amd64 + sulong_deps,
   darwin_aarch64:: darwin_aarch64 + sulong_deps,
   windows_amd64:: windows_amd64 + sulong_deps + {
     packages+: common.devkits["windows-" + self.jdk].packages

diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet
@@ -178,13 +178,13 @@ local devkits = graal_common.devkits;
   vm_linux_aarch64_ol9: self.common_vm_linux + graal_common.linux_aarch64_ol9,
 
   vm_darwin_amd64: self.common_vm_darwin + graal_common.darwin_amd64 + {
-    capabilities+: ['darwin_mojave', 'ram16gb'],
+    capabilities+: ['darwin_bigsur', 'ram16gb'],
     packages+: {
       gcc: '==4.9.2',
     },
     environment+: {
-      # for compatibility with macOS Sierra
-      MACOSX_DEPLOYMENT_TARGET: '10.13',
+      # for compatibility with macOS BigSur
+      MACOSX_DEPLOYMENT_TARGET: '11.0',
     },
   },
 

diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py
@@ -49,7 +49,7 @@
             },
             {
                 "name": "truffleruby",
-                "version": "e86d3721c8ab04a0f64f394ecd457cf84a3f394d",
+                "version": "df8c283ea8525df0f82007b2b8461bd0461f8cb9",
                 "dynamic": True,
                 "urls": [
                     {"url": "https://github.com/oracle/truffleruby.git", "kind": "git"},

diff --git a/wasm/ci/ci_common/common.jsonnet b/wasm/ci/ci_common/common.jsonnet
@@ -48,9 +48,7 @@ local graal_suite_root = root_ci.graal_suite_root;
   },
 
   darwin_aarch64:: common.darwin_aarch64,
-  darwin_amd64:: common.darwin_amd64 + {
-    capabilities+: ['darwin_catalina'],
-  },
+  darwin_amd64:: common.darwin_amd64,
 
   windows_common:: {
     packages+: $.devkits["windows-jdk" + self.jdk_version].packages,