Skip to content

Commit 450f460

Browse files
committed
Building graalpy requires cmake
1 parent 1621305 commit 450f460

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
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',

0 commit comments

Comments
 (0)