Skip to content

[GR-40332] [GR-40930] [GR-40983] Fixes for JDK19 artefacts. #4952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 14, 2022
Merged

[GR-40332] [GR-40930] [GR-40983] Fixes for JDK19 artefacts. #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4e1908
Patch sulong gate name.
ansalond Sep 13, 2022
07cbda4
Revert "Remove dumplicated env files and GraalVM configs."
ansalond Sep 13, 2022
f3d7e7a
Revert "Do not use profiles on Windows (GR-40930)."
ansalond Sep 13, 2022
ce03714
Update ProGuard libraries (GR-40983).
ansalond Sep 13, 2022
5723f30
Work around bug in sjsonnet regarding assertions.
rschatz Sep 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion graal-common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
"overlay": "b84cafb1bb9555b3b13443815280c85df77cfc75"
},

"mx_version" : "6.7.0"
"mx_version" : "6.9.1"
}
2 changes: 1 addition & 1 deletion sulong/ci.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ local sc = (import "ci_common/sulong-common.jsonnet");

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" },

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" },
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" },

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" },
]],
Expand Down
4 changes: 2 additions & 2 deletions sulong/ci_common/sulong-common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ local sulong_deps = composable((import "../../common.json").sulong.deps);
gen_name:: std.join("-", self.gen_name_componentes),
},

defBuild(b):: $.build_template + b + {
defBuild(b):: {
assert self.gen_name == self.name : "Name error. expected '%s', actual '%s'" % [self.gen_name, self.name],
} + if std.objectHasAll(b, "description_text") then { description: "%s with %s on %s/%s" % [b.description_text, self.jdk, self.os, self.arch]} else {},
} + $.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 {},

linux_amd64:: linux_amd64 + sulong_deps.linux,
linux_aarch64:: linux_aarch64 + sulong_deps.linux,
Expand Down
18 changes: 4 additions & 14 deletions vm/ci_common/common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,20 +449,10 @@ local devkits = common_json.devkits;
['set-export', 'GRAALVM_HOME', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'graalvm-home']],
],

build_base_graalvm_image_no_profiles: [
$.mx_vm_common + ['graalvm-show'],
$.mx_vm_common + ['build'],
['set-export', 'GRAALVM_HOME', $.mx_vm_common + ['--quiet', '--no-warning', 'graalvm-home']],
],

check_base_graalvm_image(os, arch, java_version): [
['set-export', 'GRAALVM_DIST', $.mx_vm_common + vm.vm_profiles + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + vm.vm_profiles + ['graalvm-dist-name']]]
] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version),

check_base_graalvm_image_no_profiles(os, arch, java_version): [
['set-export', 'GRAALVM_DIST', $.mx_vm_common + ['--quiet', '--no-warning', 'paths', $.mx_vm_common + ['graalvm-dist-name']]]
] + vm.check_graalvm_base_build('$GRAALVM_DIST', os, arch, java_version),

patch_env(os, arch, java_version):
# linux
if (os == 'linux') then
Expand Down Expand Up @@ -607,12 +597,12 @@ local devkits = common_json.devkits;
},

deploy_graalvm_base_windows_amd64(java_version): vm.check_structure + {
run: $.patch_env('windows', 'amd64', java_version) + $.build_base_graalvm_image_no_profiles + [
$.mx_vm_common + $.record_file_sizes,
run: $.patch_env('windows', 'amd64', java_version) + vm.collect_profiles() + $.build_base_graalvm_image + [
$.mx_vm_common + vm.vm_profiles + $.record_file_sizes,
$.upload_file_sizes,
$.mx_vm_common + $.maven_deploy_sdk_base,
$.mx_vm_common + vm.vm_profiles + $.maven_deploy_sdk_base,
self.ci_resources.infra.notify_nexus_deploy,
] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image_no_profiles("windows", "amd64", java_version),
] + $.create_releaser_notifier_artifact + $.check_base_graalvm_image("windows", "amd64", java_version),
notify_groups:: ['deploy'],
timelimit: '1:30:00',
},
Expand Down
4 changes: 4 additions & 0 deletions vm/mx.vm/ce-19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
DISABLE_INSTALLABLES=False
4 changes: 4 additions & 0 deletions vm/mx.vm/ce-aarch64-19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
DISABLE_INSTALLABLES=False
4 changes: 4 additions & 0 deletions vm/mx.vm/ce-darwin-19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
DISABLE_INSTALLABLES=False
4 changes: 4 additions & 0 deletions vm/mx.vm/ce-darwin-aarch64-19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
NATIVE_IMAGES=graalvm-native-binutil,graalvm-native-clang,graalvm-native-clang-cl,graalvm-native-clang++,graalvm-native-ld,gu,lib:jvmcicompiler
DISABLE_INSTALLABLES=False
4 changes: 4 additions & 0 deletions vm/mx.vm/ce-win-19
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
DYNAMIC_IMPORTS=/compiler,/regex,/sdk,/substratevm,/tools,/truffle
COMPONENTS=cmp,cov,dap,gu,gvm,icu4j,ins,insight,insightheap,lg,lsp,nfi-libffi,poly,polynative,pro,rgx,sdk,tfl,tflm
NATIVE_IMAGES=gu,lib:jvmcicompiler
DISABLE_INSTALLABLES=False
5 changes: 5 additions & 0 deletions vm/mx.vm/mx_vm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,15 @@
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']

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')
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')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-aarch64-19')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-19')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-darwin-aarch64-19')
mx_sdk_vm.register_vm_config('ce', ce_components, _suite)
mx_sdk_vm.register_vm_config('ce', ce_components, _suite, env_file='ce-19')
mx_sdk_vm.register_vm_config('ce', ce_components + ['js'], _suite, dist_name='ce-js', env_file='ce-js')
mx_sdk_vm.register_vm_config('ce', ce_components + ['js', 'njs', 'sjsvm'], _suite, dist_name='ce', env_file='ce-nodejs')
mx_sdk_vm.register_vm_config('ce', ce_components + ['llrn', 'llp', 'llrc', 'llrl'], _suite, env_file='ce-llvm')
Expand Down