Skip to content

[GR-74306] Update OS version of Darwin CI jobs. #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
graalvmbot wants to merge 5 commits into
base: master
Choose a base branch
from
Open

[GR-74306] Update OS version of Darwin CI jobs. #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38da07f
removing PBytecodeDSLRootNode.getSource to instead use PBytecodeDSLRo…
OctaveLarose Mar 31, 2026
f2b6c86
Update imports
OctaveLarose Apr 1, 2026
b9cf97c
[GR-74378] Removing PBytecodeDSLRootNode.getSource to instead use PBy…
OctaveLarose Apr 2, 2026
a4f7af0
Update OS version of Darwin CI jobs.
ansalond Mar 23, 2026
7b09ff8
Update imports
msimacek Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ci/graal/ci/common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ local common_json = import "../common.json";

graalnodejs:: {
local this = self,
capabilities+: if self.os == "darwin" then ["!darwin_bigsur", "!darwin_monterey", "!darwin_ventura"] else [],
packages+: if self.os == "linux" then {
cmake: "==3.22.2",
} else {},
Expand Down Expand Up @@ -377,7 +376,6 @@ local common_json = import "../common.json";
"*/*.log",
"*/svmbuild/*.log",
"*/svmbuild/images/*.log",
"*/*/stripped/*.map",
"*/callgrind.*",
"*.log",
],
Expand Down Expand Up @@ -489,8 +487,8 @@ local common_json = import "../common.json";
},

local linux = { os:: "linux", capabilities+: [self.os] },
# Run darwin jobs on Big Sur or later by excluding all older versions
local darwin = { os:: "darwin", capabilities+: [self.os, "!darwin_sierra", "!darwin_mojave", "!darwin_catalina"] },
# Run darwin jobs on Sonoma or later by excluding all older versions
local darwin = { os:: "darwin", capabilities+: [self.os, "!darwin_bigsur", "!darwin_ventura", "!darwin_monterey"] },
local windows = { os:: "windows", capabilities+: [self.os] },

local amd64 = { arch:: "amd64", capabilities+: [self.arch] },
Expand Down
14 changes: 7 additions & 7 deletions ci/graal/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
],

"mx_version": "7.78.0",
"mx_version": "7.78.1",

"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
"jdks": {
Expand Down Expand Up @@ -49,12 +49,12 @@
"graalvm-ee-25-ea": {"name": "graalvm-jdk", "version": "25.0.0", "ea": "36", "platformspecific": true },

"oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25.0.2+10", "platformspecific": true, "extrabundles": ["static-libs"]},
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b16-sulong", "platformspecific": true }
"labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17", "platformspecific": true },
"labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true },
"labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true },
"labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17", "platformspecific": true },
"labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-debug", "platformspecific": true },
"labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25.0.2+10-jvmci-25.1-b17-sulong", "platformspecific": true }
},

"default_jdks" : ["labsjdk-ee-latest", "labsjdk-ce-latest"],
Expand Down
8 changes: 3 additions & 5 deletions ci/python-gate.libsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,7 @@
amd64 +: common.darwin_amd64 + {
capabilities +: ["ram32gb"],
},
aarch64 +: common.darwin_aarch64 + {
capabilities +: ["darwin_bigsur"],
},
aarch64 +: common.darwin_aarch64,
},
windows +: {
amd64 +: common.windows_amd64 + {
Expand Down Expand Up @@ -280,8 +278,8 @@
local jdk_version = self.jdk_version,
local artifact_name = name + os + arch,
local capabilities = if (self.os == "darwin" && self.arch != "aarch64") then
// for darwin, amd64: set minimum requirement to bigsur
[c for c in super.capabilities if !std.startsWith(c, "darwin")] + ["darwin_bigsur"]
// for darwin, amd64: set minimum requirements
[c for c in super.capabilities if !std.startsWith(c, "darwin")]
else
super.capabilities,
capabilities: capabilities,
Expand Down
8 changes: 0 additions & 8 deletions ...cle.graal.python/src/com/oracle/graal/python/nodes/bytecode_dsl/PBytecodeDSLRootNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,14 +950,6 @@ public int getFirstLineno() {
return co.startLine;
}

public Source getSource() {
SourceSection section = getSourceSection();
if (section == null) {
return PythonUtils.createFakeSource();
}
return section.getSource();
}

@Override
public abstract boolean isCaptureFramesForTrace(boolean compiledFrame);

Expand Down
4 changes: 2 additions & 2 deletions mx.graalpython/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
},
{
"name": "tools",
"version": "781c76cda2483f09b630dea7d19074b940eb1970",
"version": "0f35b9ebdc118f82ce3b298357b88e6845417b52",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
],
},
{
"name": "regex",
"version": "781c76cda2483f09b630dea7d19074b940eb1970",
"version": "0f35b9ebdc118f82ce3b298357b88e6845417b52",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
Expand Down
Loading