diff --git a/sdk/ci/ci.jsonnet b/sdk/ci/ci.jsonnet index 9a7b2800cda6..b93aada7b652 100644 --- a/sdk/ci/ci.jsonnet +++ b/sdk/ci/ci.jsonnet @@ -2,27 +2,29 @@ local common = import '../../ci/ci_common/common.jsonnet', local utils = import '../../ci/ci_common/common-utils.libsonnet', - local sdk_gate = common.deps.spotbugs { - name: 'gate-sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch, + local sdk_gate(target) = common.deps.spotbugs { + name: target + '-sdk-oracle' + self.jdk_name + '-' + self.os + '-' + self.arch, setup: [ ["cd", "./sdk"], ], run: [ ["mx", "gate"] ], - targets: ["gate"], + targets: [target], timelimit: "30:00", guard+: { includes+: ["/sdk/**", "**.jsonnet"] + utils.top_level_ci, - } + }, + notify_groups: ["truffle"], }, local _builds = [ - common.linux_amd64 + common.oraclejdkLatest + sdk_gate + common.deps.eclipse + common.deps.jdt, - common.linux_amd64 + common.oraclejdk21 + sdk_gate + common.deps.eclipse + common.deps.jdt, - common.darwin_amd64 + common.oraclejdkLatest + sdk_gate, - common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate, - common.darwin_amd64 + common.oraclejdk21 + sdk_gate, + common.linux_amd64 + common.oraclejdkLatest + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt, + common.linux_amd64 + common.oraclejdk21 + sdk_gate("gate") + common.deps.eclipse + common.deps.jdt, + common.darwin_aarch64 + common.oraclejdkLatest + sdk_gate("gate"), + common.darwin_aarch64 + common.oraclejdk21 + sdk_gate("gate"), + common.darwin_amd64 + common.oraclejdkLatest + sdk_gate("daily"), + common.darwin_amd64 + common.oraclejdk21 + sdk_gate("daily"), ], builds: utils.add_defined_in(_builds, std.thisFile), diff --git a/sulong/ci/ci.jsonnet b/sulong/ci/ci.jsonnet index 6d7064abb5d7..f433159625c3 100644 --- a/sulong/ci/ci.jsonnet +++ b/sulong/ci/ci.jsonnet @@ -71,7 +71,7 @@ local sc = (import "ci_common/sulong-common.jsonnet"); $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_c") + { name: "gate-sulong-gcc_c-jdk-latest-linux-amd64", timelimit: "45:00" }, $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags("build,gcc_cpp") + { name: "gate-sulong-gcc_cpp-jdk-latest-linux-amd64", timelimit: "45:00" }, - $.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"] }, + $.sulong + $.gate() + sc.labsjdkLatest + sc.darwin_amd64 + sc.llvmBundled + sc.gateTags(basicTags) + { name: "daily-sulong-basic-nwcc-llvm-jdk-latest-darwin-amd64", timelimit: "0:45:00", capabilities+: ["ram16gb"], targets: []} + sc.daily, $.sulong + $.gate() + sc.labsjdkLatest + sc.linux_amd64 + sc.llvmBundled + sc.requireGMP + sc.gateTags(basicTags) + { name: "gate-sulong-basic-nwcc-llvm-jdk-latest-linux-amd64" }, diff --git a/truffle/ci/ci.jsonnet b/truffle/ci/ci.jsonnet index ac7ca13a25de..72437d1eb8ac 100644 --- a/truffle/ci/ci.jsonnet +++ b/truffle/ci/ci.jsonnet @@ -35,12 +35,13 @@ ] }, - local gate_lite = truffle_common + { - name: 'gate-truffle-lite-oraclejdk-' + self.jdk_name + '-' + self.os + '-' + self.arch, + local gate_lite(target) = truffle_common + { + name: target + '-truffle-lite-oraclejdk-' + self.jdk_name + '-' + self.os + '-' + self.arch, run: [ ["mx", "build"], ["mx", "unittest", "--verbose"], ], + targets: [target], }, local sigtest = truffle_common + { @@ -150,8 +151,8 @@ local _builds = std.flattenArrays([ [ linux_amd64 + jdk + sigtest + guard, - darwin_amd64 + jdk + truffle_weekly + gate_lite + guard, - darwin_aarch64 + jdk + truffle_weekly + gate_lite + guard, + darwin_amd64 + jdk + truffle_weekly + gate_lite("daily") + guard, + darwin_aarch64 + jdk + truffle_weekly + gate_lite("gate") + guard, ] for jdk in [common.oraclejdk21, common.oraclejdkLatest] ]) + [ diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index adfa8abfa13e..2849d5cf1256 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -112,7 +112,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; }, # Linux/AMD64 - vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'gate') + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local', other_platforms=['linux-aarch64', 'darwin-aarch64', 'windows-amd64']) + { name: 'gate-vm-maven-dry-run-linux-amd64', timelimit: '1:00:00', }, @@ -132,10 +132,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; notify_groups:: ['deploy'], }, # Darwin/AMD64 - vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'gate', jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=true, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { - name: 'gate-vm-maven-dry-run-darwin-amd64', - timelimit: '1:00:00', - }, + # We do not have a gate that executes a dry-run of Maven deployment for darwin/amd64. We just rely on the daily job defined below. vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('darwin', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { name: 'daily-deploy-vm-maven-darwin-amd64', timelimit: '1:00:00',