Skip to content

Commit a8c6b61

Browse files
committed
[GR-65404] Migrate gate-vm-native-graalpython-linux-amd64 to unchained standalone
PullRequest: graal/21124
2 parents 41447f4 + d6ff22a commit a8c6b61

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

common.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
55
],
66

7-
"mx_version": "7.55.4",
7+
"mx_version": "7.55.5",
88

99
"COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
1010
"jdks": {

vm/ci/ci_includes/vm-native.jsonnet

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
2626

2727
local truffle_maven_downloader = graal_common.deps.svm + graal_common.deps.sulong + {
2828
run+: [
29-
['export', 'SVM_SUITE=' + vm.svm_suite],
3029
['mx', '--env', 'ce-llvm', '--native-images=', 'gate', '--no-warning-as-error', '--tags', 'build,maven-downloader'],
3130
],
3231
notify_groups: ["truffle"],
@@ -41,8 +40,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
4140
local builds = [
4241
vm.vm_java_Latest + graal_common.deps.svm + graal_common.deps.sulong + graal_common.deps.graalpy + vm.custom_vm + vm_common.vm_base('linux', 'amd64', 'gate') + {
4342
run+: [
44-
['export', 'SVM_SUITE=' + vm.svm_suite],
45-
['mx', '--dynamicimports', '$SVM_SUITE,graalpython', '--disable-polyglot', '--disable-libpolyglot', '--force-bash-launchers=lli,native-image', 'gate', '--no-warning-as-error', '--tags', 'build,python'],
43+
['mx', '--env', vm.edition, '--native-images=true', '--dy', 'graalpython', 'gate', '-B--targets=GRAALPY_NATIVE_STANDALONE', '--no-warning-as-error', '--tags', 'build,python'],
4644
],
4745
timelimit: '45:00',
4846
name: 'gate-vm-native-graalpython-linux-amd64',

vm/mx.vm/mx_vm_gate.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ def distribution_paths(dname):
593593
def gate_python(tasks):
594594
with Task('Python', tasks, tags=[VmGateTasks.python]) as t:
595595
if t:
596-
python_svm_image_path = join(mx_sdk_vm_impl.graalvm_output(), 'bin', 'graalpy')
596+
python_svm_image_path = join(mx.distribution('GRAALPY_NATIVE_STANDALONE').output, 'bin', 'graalpy')
597597
python_suite = mx.suite("graalpython")
598598
python_suite.extensions.run_python_unittests(python_svm_image_path)
599599

0 commit comments

Comments
 (0)