Skip to content

Commit

Permalink
[GR-55132] [GR-60310] Periodic update of the language imports and Gra…
Browse files Browse the repository at this point in the history
…dle as dependency for GraalPy.

PullRequest: graal/19519
  • Loading branch information
OracleLabsAutomation committed Dec 9, 2024
2 parents 0037b72 + 8187c6d commit be6e597
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
8 changes: 7 additions & 1 deletion ci/common.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion vm/mx.vm/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
},
{
"name": "graalpython",
"version": "cc992337891dc6f2dfe88ebb26691917eb8c09a4",
"version": "efde0fb6e3807d5bb001baa73c840dce3d292e29",
"dynamic": True,
"urls": [
{"url": "https://github.com/graalvm/graalpython.git", "kind": "git"},
Expand Down

0 comments on commit be6e597

Please sign in to comment.