diff --git a/ci/common.jsonnet b/ci/common.jsonnet index d2ef2c435725..7ffa08c93e5f 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -203,6 +203,12 @@ local common_json = import "../common.json"; }, }, + gradle:: { + downloads+: { + GRADLE_JAVA_HOME: jdks_data["oraclejdk21"], + } + }, + local code_tools = { downloads+: if 'jdk_version' in self && self.jdk_version > 21 then { TOOLS_JAVA_HOME: jdks_data['oraclejdk21'], @@ -251,7 +257,7 @@ local common_json = import "../common.json"; } else {}, }, - graalpy:: { + graalpy:: self.gradle + { packages+: if (self.os == "linux") then { libffi: '>=3.2.1', bzip2: '>=1.0.6', diff --git a/vm/mx.vm/suite.py b/vm/mx.vm/suite.py index f513a0d9c82d..ab58b331f1f4 100644 --- a/vm/mx.vm/suite.py +++ b/vm/mx.vm/suite.py @@ -65,7 +65,7 @@ }, { "name": "graalpython", - "version": "cc992337891dc6f2dfe88ebb26691917eb8c09a4", + "version": "efde0fb6e3807d5bb001baa73c840dce3d292e29", "dynamic": True, "urls": [ {"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},