Skip to content

Commit

Permalink
vm/ci: move maven gates to JDK 21
Browse files Browse the repository at this point in the history
  • Loading branch information
@zapster
zapster committed Jun 23, 2023
1 parent b021758 commit 52c57fc
Showing 1 changed file with 26 additions and 26 deletions.
52 changes: 26 additions & 26 deletions vm/ci/ci_includes/vm.jsonnet
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
],
},

maven_17_20:: {
maven_17_21:: {
downloads+: {
JAVA_HOME: graal_common.jdks_data['labsjdk-ce-17'],
EXTRA_JAVA_HOMES: graal_common.jdks_data['labsjdk-ce-20'],
EXTRA_JAVA_HOMES: graal_common.jdks_data['labsjdk-ce-21'],
},
mx_cmd_base:: ['mx', '--dynamicimports', '/tools,/compiler,/graal-js,/espresso,/substratevm', '--disable-installables=true', '--force-bash-launcher=true', '--skip-libraries=true'],
build:: self.mx_cmd_base + ['build'],
Expand All @@ -56,7 +56,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
(if repo == null then [] else [repo]),
},

maven_17_20_only_native:: self.maven_17_20 + {
maven_17_21_only_native:: self.maven_17_21 + {
native_distributions:: 'TRUFFLE_NFI_NATIVE,SVM_HOSTED_NATIVE',
mx_cmd_base:: ['mx', '--dynamicimports', '/substratevm', '--disable-installables=true', '--force-bash-launcher=true', '--skip-libraries=true'],
build:: self.mx_cmd_base + ['build', '--dependencies', self.native_distributions],
Expand Down Expand Up @@ -117,21 +117,21 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
},

local builds = [
utils.add_gate_predicate(self.vm_java_20 + vm_common.gate_vm_linux_amd64 + {
utils.add_gate_predicate(self.vm_java_21 + vm_common.gate_vm_linux_amd64 + {
run: [
['mx', 'build'],
['mx', 'unittest', '--suite', 'vm'],
],
name: 'gate-vm-unittest-linux-amd64',
}, ['sdk', 'truffle', 'vm']),
utils.add_gate_predicate(self.vm_java_20 + graal_common.devkits['windows-jdk20'] + vm_common.gate_vm_windows_amd64 + {
utils.add_gate_predicate(self.vm_java_21 + graal_common.devkits['windows-jdk20'] + vm_common.gate_vm_windows_amd64 + {
run: [
['mx', 'build'],
['mx', 'unittest', '--suite', 'vm'],
],
name: 'gate-vm-unittest-windows-amd64',
}, ["sdk", "truffle", "vm"]),
self.vm_java_20 + vm_common.gate_vm_linux_amd64 + vm_common.sulong_linux + {
self.vm_java_21 + vm_common.gate_vm_linux_amd64 + vm_common.sulong_linux + {
environment+: {
DYNAMIC_IMPORTS: '/tools,/substratevm,/sulong',
NATIVE_IMAGES: 'polyglot',
Expand All @@ -142,49 +142,49 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
],
name: 'gate-vm-build-without-vcs-linux-amd64',
},
vm_common.linux_deploy + vm_common.gate_vm_linux_amd64 + self.maven_17_20 + vm_common.sulong_linux + {
run: [ $.maven_17_20.build, $.maven_17_20.deploy(repo='lafo-maven', dry_run=true)],
vm_common.linux_deploy + vm_common.gate_vm_linux_amd64 + self.maven_17_21 + vm_common.sulong_linux + {
run: [ $.maven_17_21.build, $.maven_17_21.deploy(repo='lafo-maven', dry_run=true)],
name: 'gate-vm-maven-dry-run-linux-amd64',
},
vm_common.linux_deploy + vm_common.deploy_vm_linux_amd64 + self.maven_17_20 + vm_common.sulong_linux + {
run: [ $.maven_17_20.build, $.maven_17_20.deploy(repo='lafo-maven')],
vm_common.linux_deploy + vm_common.deploy_vm_linux_amd64 + self.maven_17_21 + vm_common.sulong_linux + {
run: [ $.maven_17_21.build, $.maven_17_21.deploy(repo='lafo-maven')],
name: 'post-merge-deploy-vm-maven-linux-amd64',
timelimit: '45:00',
notify_groups:: ['deploy'],
},
vm_common.linux_deploy + vm_common.gate_vm_linux_aarch64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven', dry_run=true)],
vm_common.linux_deploy + vm_common.gate_vm_linux_aarch64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven', dry_run=true)],
name: 'gate-vm-maven-dry-run-linux-aarch64',
},
vm_common.linux_deploy + vm_common.deploy_vm_linux_aarch64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven')],
vm_common.linux_deploy + vm_common.deploy_vm_linux_aarch64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven')],
name: 'post-merge-deploy-vm-maven-linux-aarch64',
notify_groups:: ['deploy'],
},
vm_common.darwin_deploy + vm_common.gate_vm_darwin_amd64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven', dry_run=true)],
vm_common.darwin_deploy + vm_common.gate_vm_darwin_amd64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven', dry_run=true)],
name: 'gate-vm-maven-dry-run-darwin-amd64',
},
vm_common.darwin_deploy + vm_common.gate_vm_darwin_aarch64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven', dry_run=true)],
vm_common.darwin_deploy + vm_common.gate_vm_darwin_aarch64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven', dry_run=true)],
name: 'gate-vm-maven-dry-run-darwin-aarch64',
},
vm_common.darwin_deploy + vm_common.deploy_daily_vm_darwin_amd64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven')],
vm_common.darwin_deploy + vm_common.deploy_daily_vm_darwin_amd64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven')],
name: 'daily-deploy-vm-maven-darwin-amd64',
notify_groups:: ['deploy'],
},
vm_common.darwin_deploy + vm_common.deploy_daily_vm_darwin_aarch64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven')],
vm_common.darwin_deploy + vm_common.deploy_daily_vm_darwin_aarch64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven')],
name: 'daily-deploy-vm-maven-darwin-aarch64',
notify_groups:: ['deploy'],
},
vm_common.svm_common_windows_amd64("17") + vm_common.gate_vm_windows_amd64 + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven', dry_run=true)],
vm_common.svm_common_windows_amd64("17") + vm_common.gate_vm_windows_amd64 + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven', dry_run=true)],
name: 'gate-vm-maven-dry-run-windows-amd64',
},
vm_common.svm_common_windows_amd64("17") + vm_common.deploy_daily_vm_windows + self.maven_17_20_only_native + {
run: [ $.maven_17_20_only_native.build, $.maven_17_20_only_native.deploy(repo='lafo-maven')],
vm_common.svm_common_windows_amd64("17") + vm_common.deploy_daily_vm_windows + self.maven_17_21_only_native + {
run: [ $.maven_17_21_only_native.build, $.maven_17_21_only_native.deploy(repo='lafo-maven')],
name: 'daily-deploy-vm-maven-windows-amd64',
notify_groups:: ['deploy'],
},
Expand Down

0 comments on commit 52c57fc

Please sign in to comment.