From c928ec5746bb671f6ad78b8badd0a80f33750987 Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Wed, 8 Mar 2023 15:39:12 +0100 Subject: [PATCH 1/3] 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, From 5314fa40d7ac53d39d26edb53093182e55835ca1 Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Fri, 10 Nov 2023 17:30:29 +0100 Subject: [PATCH 2/3] Add new darwin-aarch64 gates back (cherry picked from commit e0ac1fa345bbe4de8d38569d7aa2fa481a675392) --- sdk/ci/ci.jsonnet | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet index 83ffa99c11b0..24e48185ffc2 100644 --- 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, ] } From b941178d4b028e92a4cd48adec32161740fdb80b Mon Sep 17 00:00:00 2001 From: Gilles Duboscq Date: Fri, 10 Nov 2023 17:31:31 +0100 Subject: [PATCH 3/3] Allow sulong gate to run on big sur (cherry picked from commit 421e12ab56d6ed25a8fadb3a58bcec82648d8f36) --- sulong/ci/ci.jsonnet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet index 938fcd66475f..c6768a0994fc 100644 --- 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" },