Skip to content

Commit e209f26

Browse files
ansalondansalond
committed
[GR-40332] [GR-40930] [GR-40983] Fixes for JDK19 artefacts.
PullRequest: graal/12649
2 parents 5ac3938 + 5723f30 commit e209f26

File tree

10 files changed

+33
-18
lines changed

10 files changed

+33
-18
lines changed

‎graal-common.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
"overlay": "b84cafb1bb9555b3b13443815280c85df77cfc75"
55
},
66

7-
"mx_version" : "6.7.0"
7+
"mx_version" : "6.9.1"
88
}

‎sulong/ci.jsonnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");
7474

7575
sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.linux_aarch64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-linux-aarch64", timelimit: "30:00" },
7676

77-
sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMPDarwinAArch64 + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-jdk17-darwin-aarch64", timelimit: "30:00" },
77+
sc.gate + $.sulong + sc.labsjdk_ce_17 + sc.darwin_aarch64 + sc.llvmBundled + sc.requireGMPDarwinAArch64 + sc.gateTags(basicTagsNoNWCC) + { name: "gate-sulong-basic-llvm-jdk17-darwin-aarch64", timelimit: "30:00" },
7878

7979
sc.weekly + $.sulong + sc.labsjdk_ce_17 + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.requireGCC + $.sulong_coverage { name: "weekly-sulong-coverage-jdk17-linux-amd64" },
8080
]],

‎sulong/ci_common/sulong-common.jsonnet‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ local sulong_deps = composable((import "../../common.json").sulong.deps);
3939
gen_name:: std.join("-", self.gen_name_componentes),
4040
},
4141

42-
defBuild(b):: $.build_template + b + {
42+
defBuild(b):: {
4343
assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name],
44-
} + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {},
44+
} + $.build_template + b + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {},
4545

4646
linux_amd64:: linux_amd64 + sulong_deps.linux,
4747
linux_aarch64:: linux_aarch64 + sulong_deps.linux,

‎vm/ci_common/common.jsonnet‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -449,20 +449,10 @@ local devkits = common_json.devkits;
449449
['set-export', 'GRAALVM_HOME', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'graalvm-home']],
450450
],
451451

452-
build_base_graalvm_image_no_profiles: [
453-
$.mx_vm_common + ['graalvm-show'],
454-
$.mx_vm_common + ['build'],
455-
['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']],
456-
],
457-
458452
check_base_graalvm_image(os, arch, java_version): [
459453
['set-export', 'GRAALVM_DIST', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + vm.vm_profiles + ['graalvm-dist-name']]]
460454
] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version),
461455

462-
check_base_graalvm_image_no_profiles(os, arch, java_version): [
463-
['set-export', 'GRAALVM_DIST', $.mx_vm_common + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + ['graalvm-dist-name']]]
464-
] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version),
465-
466456
patch_env(os, arch, java_version):
467457
# linux
468458
if (os == 'linux') then
@@ -607,12 +597,12 @@ local devkits = common_json.devkits;
607597
},
608598

609599
deploy_graalvm_base_windows_amd64(java_version): vm.check_structure + {
610-
run: $.patch_env('windows', 'amd64', java_version) + $.build_base_graalvm_image_no_profiles + [
611-
$.mx_vm_common + $.record_file_sizes,
600+
run: $.patch_env('windows', 'amd64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [
601+
$.mx_vm_common + vm.vm_profiles + $.record_file_sizes,
612602
$.upload_file_sizes,
613-
$.mx_vm_common + $.maven_deploy_sdk_base,
603+
$.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base,
614604
self.ci_resources.infra.notify_nexus_deploy,
615-
] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image_no_profiles("windows", "amd64", java_version),
605+
] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("windows", "amd64", java_version),
616606
notify_groups:: ['deploy'],
617607
timelimit: '1:30:00',
618608
},

‎vm/mx.vm/ce-19‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
2+
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
3+
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
4+
DISABLE_INSTALLABLES=False

‎vm/mx.vm/ce-aarch64-19‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
2+
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
3+
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
4+
DISABLE_INSTALLABLES=False

‎vm/mx.vm/ce-darwin-19‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
2+
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
3+
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
4+
DISABLE_INSTALLABLES=False

‎vm/mx.vm/ce-darwin-aarch64-19‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
2+
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
3+
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
4+
DISABLE_INSTALLABLES=False

‎vm/mx.vm/ce-win-19‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
2+
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
3+
NATIVE_IMAGES=gu,lib:jvmcicompiler
4+
DISABLE_INSTALLABLES=False

‎vm/mx.vm/mx_vm.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,15 @@
178178
ce_no_native_components = ['bgu', 'bpolyglot', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'insight', 'insightheap', 'lsp', 'nfi-libffi', 'nfi', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm', 'libpoly', 'poly']
179179

180180
mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win')
181+
mx_sdk_vm.register_vm_config('ce', ['insight', 'insightheap', 'cmp', 'cov', 'dap', 'gu', 'gvm', 'icu4j', 'ins', 'lg', 'libpoly', 'lsp', 'nfi-libffi', 'nfi', 'poly', 'bpolyglot', 'polynative', 'pro', 'rgx', 'sdk', 'spolyglot', 'tfl', 'tflm'], _suite, env_file='ce-win-19')
181182
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64')
183+
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64-19')
182184
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin')
185+
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-19')
183186
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64')
187+
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64-19')
184188
mx_sdk_vm.register_vm_config('ce', ce_components, _suite)
189+
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-19')
185190
mx_sdk_vm.register_vm_config('ce', ce_components + ['js'], _suite, dist_name='ce-js', env_file='ce-js')
186191
mx_sdk_vm.register_vm_config('ce', ce_components + ['js', 'njs', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs')
187192
mx_sdk_vm.register_vm_config('ce', ce_components + ['llrn', 'llp', 'llrc', 'llrl'], _suite, env_file='ce-llvm')

0 commit comments

Comments
 (0)