@@ -203,7 +203,7 @@ def get_jdk():
203
203
tag = 'jvmci'
204
204
else :
205
205
tag = None
206
- return mx .get_jdk (tag = tag )
206
+ return mx .get_jdk ()
207
207
208
208
209
209
def full_python (args , ** kwargs ):
@@ -1506,22 +1506,25 @@ def graalpython_gate_runner(args, tasks):
1506
1506
if task :
1507
1507
env = {}
1508
1508
env ['ENABLE_STANDALONE_UNITTESTS' ] = 'true'
1509
+ jdk_version = mx .get_jdk ().javaCompliance # Not our "get_jdk", because we do not want the jvmci tag.
1509
1510
# build graalvm jdk
1510
1511
mx_args = ['-p' , os .path .join (mx .suite ('truffle' ).dir , '..' , 'vm' ), '--env' , 'ce' ]
1511
1512
if not DISABLE_REBUILD :
1512
- mx .run_mx (mx_args + ["build" , "--dep" , f"GRAALVM_COMMUNITY_JAVA{ get_jdk (). javaCompliance } " ])
1513
+ mx .run_mx (mx_args + ["build" , "--dep" , f"GRAALVM_COMMUNITY_JAVA{ jdk_version } " ])
1513
1514
out = mx .OutputCapture ()
1514
1515
mx .run_mx (mx_args + ["graalvm-home" ], out = out )
1515
1516
home = out .data .splitlines ()[- 1 ].strip ()
1516
1517
env ['JAVA_HOME' ] = home
1517
1518
# build python standalone
1518
1519
mx_args = ['-p' , os .path .join (mx .suite ('truffle' ).dir , '..' , 'vm' ), '--env' , 'ce-python' ]
1519
1520
if not DISABLE_REBUILD :
1520
- mx .run_mx (mx_args + ["build" , "--dep" , f"PYTHON_JAVA_STANDALONE_SVM_JAVA{ get_jdk (). javaCompliance } " ])
1521
+ mx .run_mx (mx_args + ["build" , "--dep" , f"PYTHON_JAVA_STANDALONE_SVM_JAVA{ jdk_version } " ])
1521
1522
out = mx .OutputCapture ()
1522
1523
mx .run_mx (mx_args + ["standalone-home" , "--type" , "jvm" , "python" ], out = out )
1523
1524
python_home = out .data .splitlines ()[- 1 ].strip ()
1524
1525
env ['PYTHON_STANDALONE_HOME' ] = python_home
1526
+ # build GraalPy and all the necessary dependencies, so that we can deploy them
1527
+ mx .run_mx (["build" ])
1525
1528
# deploy maven artifacts
1526
1529
import mx_sdk_vm_impl
1527
1530
version = mx_sdk_vm_impl .graalvm_version ('graalvm' )
0 commit comments