Skip to content

Commit 8b809e9

Browse files
steve-stimfel
authored andcommitted
Fix build and deployment before the standalone tests
(cherry picked from commit 8313b9c)
1 parent 6b49b10 commit 8b809e9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

mx.graalpython/mx_graalpython.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def get_jdk():
203203
tag = 'jvmci'
204204
else:
205205
tag = None
206-
return mx.get_jdk(tag=tag)
206+
return mx.get_jdk()
207207

208208

209209
def full_python(args, **kwargs):
@@ -1506,22 +1506,25 @@ def graalpython_gate_runner(args, tasks):
15061506
if task:
15071507
env = {}
15081508
env['ENABLE_STANDALONE_UNITTESTS'] = 'true'
1509+
jdk_version = mx.get_jdk().javaCompliance # Not our "get_jdk", because we do not want the jvmci tag.
15091510
# build graalvm jdk
15101511
mx_args = ['-p', os.path.join(mx.suite('truffle').dir, '..', 'vm'), '--env', 'ce']
15111512
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}"])
15131514
out = mx.OutputCapture()
15141515
mx.run_mx(mx_args + ["graalvm-home"], out=out)
15151516
home = out.data.splitlines()[-1].strip()
15161517
env['JAVA_HOME'] = home
15171518
# build python standalone
15181519
mx_args = ['-p', os.path.join(mx.suite('truffle').dir, '..', 'vm'), '--env', 'ce-python']
15191520
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}"])
15211522
out = mx.OutputCapture()
15221523
mx.run_mx(mx_args + ["standalone-home", "--type", "jvm", "python"], out=out)
15231524
python_home = out.data.splitlines()[-1].strip()
15241525
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"])
15251528
# deploy maven artifacts
15261529
import mx_sdk_vm_impl
15271530
version = mx_sdk_vm_impl.graalvm_version('graalvm')

0 commit comments

Comments
 (0)