From 1d799165e35852adab87b57965b82b937fdbfae3 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)
---
 common.hocon              | 2 +-
 common.jsonnet            | 3 ++-
 vm/ci_common/common.hocon | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/common.hocon b/common.hocon
index d18c646a4344..bb76c3eb40b2 100644
--- a/common.hocon
+++ b/common.hocon
@@ -59,7 +59,7 @@ linux-amd64 : ${linux} {
 }
 
 darwin-amd64 : ${darwin} {
-  capabilities : [darwin, amd64]
+  capabilities : [darwin, amd64, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"]
 }
 
 windows-amd64 : ${windows} {
diff --git a/common.jsonnet b/common.jsonnet
index 4944c97b44d9..4ef654600b44 100644
--- a/common.jsonnet
+++ b/common.jsonnet
@@ -117,7 +117,8 @@
 
   darwin:: deps.darwin + self.common + {
     os::"darwin",
-    capabilities+: [self.os],
+    # Run darwin jobs on Big Sur or later by excluding all older versions
+    capabilities+: [self.os, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"],
   },
 
   windows:: deps.windows + self.common + {
diff --git a/vm/ci_common/common.hocon b/vm/ci_common/common.hocon
index b46a44934b46..ce2716a1dc14 100644
--- a/vm/ci_common/common.hocon
+++ b/vm/ci_common/common.hocon
@@ -19,8 +19,8 @@ common_vm_darwin: ${common_vm} ${darwin} {
   }
   environment: {
     LANG: en_US.UTF-8
-    # for compatibility with macOS Sierra
-    MACOSX_DEPLOYMENT_TARGET: "10.12"
+    # for compatibility with macOS Big Sur
+    MACOSX_DEPLOYMENT_TARGET: "11.0"
   }
   setup: ${common_vm.setup}
 }
@@ -177,7 +177,7 @@ vm_linux_aarch64: ${common_vm_linux} {
 }
 
 vm_darwin: ${common_vm_darwin} {
-  capabilities: [darwin_mojave, amd64, ram16gb]
+  capabilities: [darwin_bigsur, amd64, ram16gb]
 }
 
 vm_windows: ${common_vm_windows} {