From c928ec5746bb671f6ad78b8badd0a80f33750987 Mon Sep 17 00:00:00 2001
From: Gilles Duboscq <gilles.m.duboscq@oracle.com>
Date: Wed, 8 Mar 2023 15:39:12 +0100
Subject: [PATCH] Build GraalVM on Big Sur

Ensure we don't use older macos versions

(cherry picked from commit b7718e93a7288d24dc3c3ca88cdefea6f6ff8e23)
---
 ci/common.jsonnet                         | 3 ++-
 espresso/ci/ci_common/common.jsonnet      | 6 +++---
 sulong/ci/ci_common/sulong-common.jsonnet | 3 +--
 vm/ci/ci_common/common.jsonnet            | 6 +++---
 wasm/ci/ci_common/common.jsonnet          | 4 +---
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/ci/common.jsonnet b/ci/common.jsonnet
index 9b5e14620c32..c1ed34c3714a 100644
--- 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
index 0d92fa4cb1d9..04cc44c63305 100644
--- 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/sulong/ci/ci_common/sulong-common.jsonnet b/sulong/ci/ci_common/sulong-common.jsonnet
index 3cc7230562e9..7f6fce8d10a3 100644
--- 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
index db48131c43ba..00178b9ddfba 100644
--- 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/wasm/ci/ci_common/common.jsonnet b/wasm/ci/ci_common/common.jsonnet
index 2461e69165f2..be60a659e5d2 100644
--- 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,