Skip to content

Commit 94cf370

Browse files
committed
[GR-65634] Start 26.0.0 dev cycle.
PullRequest: truffleruby/4554
2 parents 768abb9 + 92c797e commit 94cf370

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

ci/common.jsonnet

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,12 @@ local common_json = import "../common.json";
205205
},
206206
},
207207

208+
cmake:: {
209+
packages+: {
210+
cmake: "==3.22.2",
211+
},
212+
},
213+
208214
gradle:: {
209215
downloads+: {
210216
GRADLE_JAVA_HOME: jdks_data["oraclejdk21"],
@@ -221,10 +227,8 @@ local common_json = import "../common.json";
221227
# GR-49566: SpotBugs does not yet run on JDK 22
222228
spotbugs: code_tools,
223229

224-
sulong:: {
225-
packages+: {
226-
cmake: "==3.22.2",
227-
} + if self.os == "windows" then {
230+
sulong:: self.cmake + {
231+
packages+: if self.os == "windows" then {
228232
msvc_source: "==14.0",
229233
} else {},
230234
},
@@ -259,7 +263,7 @@ local common_json = import "../common.json";
259263
} else {},
260264
},
261265

262-
graalpy:: self.gradle + {
266+
graalpy:: self.gradle + self.cmake + {
263267
packages+: if (self.os == "linux") then {
264268
libffi: '>=3.2.1',
265269
bzip2: '>=1.0.6',

mx.truffleruby/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
suite = {
22
"mxversion": "7.45.0",
33
"name": "truffleruby",
4-
"version": "25.0.0",
4+
"version": "26.0.0",
55
"release": False,
66
"groupId": "org.graalvm.ruby",
77
"url": "https://www.graalvm.org/ruby/",
@@ -22,7 +22,7 @@
2222
{
2323
"name": "regex",
2424
"subdir": True,
25-
"version": "70e5b13b1ff68b5eadabf37493de9911723a0765",
25+
"version": "38a4ec195b58325c3f7d710b3dc17d7941ae0261",
2626
"urls": [
2727
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2828
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -31,7 +31,7 @@
3131
{
3232
"name": "sulong",
3333
"subdir": True,
34-
"version": "70e5b13b1ff68b5eadabf37493de9911723a0765",
34+
"version": "38a4ec195b58325c3f7d710b3dc17d7941ae0261",
3535
"urls": [
3636
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
3737
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

0 commit comments

Comments
 (0)