From 68005244275517cc882b4291b2f19fd83baf7cb9 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 11 Jun 2024 20:44:23 +0200 Subject: [PATCH 1/2] Fix version of javadoc publisher. --- ci_includes/publish-javadoc.jsonnet | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet index 22e05ca39422..ef3505b2ba0b 100644 --- a/ci_includes/publish-javadoc.jsonnet +++ b/ci_includes/publish-javadoc.jsonnet @@ -28,16 +28,8 @@ ["cd", ".."], ["git", "clone", ["mx", "urlrewrite", "https://github.com/graalvm/graalvm-website.git"]], ["cd", "graalvm-website"], - # dev-only - ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"], - ["git", "status" ], - ["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"], - ["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"], - ["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"], - ["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"], - ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"], # dev or release - ["set-export", "GRAAL_VERSION", "dev"], + ["set-export", "GRAAL_VERSION", "24.1"], ["rm", "-rf", "$GRAAL_VERSION/javadoc"], ["mkdir", "-p", "$GRAAL_VERSION/javadoc"], ["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/sdk/javadoc.zip"], From 6c4f42bf5368c480ef2c9c29f0163d30d827b001 Mon Sep 17 00:00:00 2001 From: Danilo Ansaloni Date: Tue, 11 Jun 2024 20:59:19 +0200 Subject: [PATCH 2/2] Run relevant deploy jobs post-merge. --- vm/ci/ci_common/common-runspec.jsonnet | 18 +++++------ vm/ci/ci_common/common.jsonnet | 10 +++--- vm/ci/ci_includes/vm.jsonnet | 42 +++++++++++++------------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/vm/ci/ci_common/common-runspec.jsonnet b/vm/ci/ci_common/common-runspec.jsonnet index d86ef6f57acf..ae8613dc0e26 100644 --- a/vm/ci/ci_common/common-runspec.jsonnet +++ b/vm/ci/ci_common/common-runspec.jsonnet @@ -211,15 +211,15 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object} "linux:amd64:jdk21": weekly, "linux:amd64:jdk-latest": post_merge, "linux:aarch64:jdk21": weekly + capabilities('!xgene3') + timelimit('1:30:00'), - "linux:aarch64:jdk-latest": daily + capabilities('!xgene3') + timelimit('1:30:00'), + "linux:aarch64:jdk-latest": post_merge + capabilities('!xgene3') + timelimit('1:30:00'), "darwin:amd64:jdk21": weekly, - "darwin:amd64:jdk-latest": daily, + "darwin:amd64:jdk-latest": post_merge, "darwin:aarch64:jdk21": weekly + timelimit('1:45:00') + notify_emails('bernhard.urban-forster@oracle.com'), - "darwin:aarch64:jdk-latest": daily + timelimit('1:45:00') + notify_emails('bernhard.urban-forster@oracle.com'), + "darwin:aarch64:jdk-latest": post_merge + timelimit('1:45:00') + notify_emails('bernhard.urban-forster@oracle.com'), "windows:amd64:jdk21": weekly + timelimit('1:30:00'), - "windows:amd64:jdk-latest": daily + timelimit('1:30:00'), + "windows:amd64:jdk-latest": post_merge + timelimit('1:30:00'), }), }, @@ -229,11 +229,11 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object} # "vm-espresso": mx_env + deploy_graalvm_espresso + espresso_os_arch_jdk_mixin + platform_spec(no_jobs) + ( if vm.deploy_espress_standalone then platform_spec({ - "linux:amd64:jdk21": weekly, - "linux:aarch64:jdk21": weekly, - "darwin:amd64:jdk21": weekly, - "darwin:aarch64:jdk21": weekly, - "windows:amd64:jdk21": weekly, + "linux:amd64:jdk21": post_merge, + "linux:aarch64:jdk21": post_merge, + "darwin:amd64:jdk21": post_merge, + "darwin:aarch64:jdk21": post_merge, + "windows:amd64:jdk21": post_merge, }) else {}), }, diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet index 3daf2ac55189..320087067f0c 100644 --- a/vm/ci/ci_common/common.jsonnet +++ b/vm/ci/ci_common/common.jsonnet @@ -557,31 +557,31 @@ local devkits = graal_common.devkits; # Linux/AMD64 # - JDK-Latest - deploy_vm_standalones_javaLatest_linux_amd64: vm.vm_java_Latest + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'amd64', 'daily', deploy=true) + self.deploy_graalvm_components('latest', standalones=true, record_file_sizes=true) + {name: 'daily-deploy-vm-standalones-java-latest-linux-amd64', notify_groups:: ["deploy"]}, + deploy_vm_standalones_javaLatest_linux_amd64: vm.vm_java_Latest + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'amd64', 'post-merge', deploy=true) + self.deploy_graalvm_components('latest', standalones=true, record_file_sizes=true) + {name: 'post-merge-deploy-vm-standalones-java-latest-linux-amd64', notify_groups:: ["deploy"]}, # - JDK21 deploy_vm_standalones_java21_linux_amd64: vm.vm_java_21 + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'amd64', 'weekly', deploy=true) + self.deploy_graalvm_components("java21", standalones=true, record_file_sizes=true) + {name: 'weekly-deploy-vm-standalones-java21-linux-amd64', notify_groups:: ["deploy"]}, # Linux/AARCH64 # - JDK-Latest - deploy_vm_standalones_javaLatest_linux_aarch64: vm.vm_java_Latest + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_components('latest', standalones=true) + {name: 'daily-deploy-vm-standalones-java-latest-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]}, + deploy_vm_standalones_javaLatest_linux_aarch64: vm.vm_java_Latest + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'aarch64', 'post-merge', deploy=true) + self.deploy_graalvm_components('latest', standalones=true) + {name: 'post-merge-deploy-vm-standalones-java-latest-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]}, # - JDK21 deploy_vm_standalones_java21_linux_aarch64: vm.vm_java_21 + self.full_vm_build + self.linux_deploy + self.vm_base('linux', 'aarch64', 'weekly', deploy=true) + self.deploy_graalvm_components("java21", standalones=true) + {name: 'weekly-deploy-vm-standalones-java21-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]}, # Darwin/AMD64 # - JDK-Latest - deploy_vm_standalones_javaLatest_darwin_amd64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_components('latest', standalones=true) + {name: 'daily-deploy-vm-standalones-java-latest-darwin-amd64', capabilities+: ["!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'}, + deploy_vm_standalones_javaLatest_darwin_amd64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'amd64', 'post-merge', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_components('latest', standalones=true) + {name: 'post-merge-deploy-vm-standalones-java-latest-darwin-amd64', capabilities+: ["!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'}, # - JDK21 deploy_vm_standalones_java21_darwin_amd64: vm.vm_java_21 + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'amd64', 'weekly', deploy=true) + self.deploy_graalvm_components("java21", standalones=true) + {name: 'weekly-deploy-vm-standalones-java21-darwin-amd64', capabilities+: ["!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'}, # Darwin/AARCH64 # - JDK-Latest - deploy_vm_standalones_javaLatest_darwin_aarch64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'aarch64', 'daily', deploy=true) + self.deploy_graalvm_components('latest', standalones=true) + {name: 'daily-deploy-vm-standalones-java-latest-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["bernhard.urban-forster@oracle.com"], timelimit: '3:00:00'}, + deploy_vm_standalones_javaLatest_darwin_aarch64: vm.vm_java_Latest + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'aarch64', 'post-merge', deploy=true) + self.deploy_graalvm_components('latest', standalones=true) + {name: 'post-merge-deploy-vm-standalones-java-latest-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["bernhard.urban-forster@oracle.com"], timelimit: '3:00:00'}, # - JDK21 deploy_vm_standalones_java21_darwin_aarch64: vm.vm_java_21 + self.full_vm_build + self.darwin_deploy + self.vm_base('darwin', 'aarch64', 'weekly', deploy=true) + self.deploy_graalvm_components("java21", standalones=true) + {name: 'weekly-deploy-vm-standalones-java21-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["bernhard.urban-forster@oracle.com"], timelimit: '3:00:00'}, # Windows/AMD64 # - JDK-Latest - deploy_vm_standalones_javaLatest_windows_amd64: vm.vm_java_Latest + self.svm_common_windows_amd64('Latest') + self.js_windows_common + self.sulong + self.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_components('latest', standalones=true) + self.deploy_build + {name: 'daily-deploy-vm-standalones-java-latest-windows-amd64', timelimit: '2:30:00', notify_groups:: ["deploy"]}, + deploy_vm_standalones_javaLatest_windows_amd64: vm.vm_java_Latest + self.svm_common_windows_amd64('Latest') + self.js_windows_common + self.sulong + self.vm_base('windows', 'amd64', 'post-merge', deploy=true, jdk_hint='Latest') + self.deploy_graalvm_components('latest', standalones=true) + self.deploy_build + {name: 'post-merge-deploy-vm-standalones-java-latest-windows-amd64', timelimit: '2:30:00', notify_groups:: ["deploy"]}, # - JDK21 deploy_vm_standalones_java21_windows_amd64: vm.vm_java_21 + self.svm_common_windows_amd64("21") + self.js_windows_common + self.sulong + self.vm_base('windows', 'amd64', 'weekly', deploy=true, jdk_hint='21') + self.deploy_graalvm_components("java21", standalones=true) + self.deploy_build + {name: 'weekly-deploy-vm-standalones-java21-windows-amd64', timelimit: '2:30:00', notify_groups:: ["deploy"]}, diff --git a/vm/ci/ci_includes/vm.jsonnet b/vm/ci/ci_includes/vm.jsonnet index aa27c90907e5..9693bc588687 100644 --- a/vm/ci/ci_includes/vm.jsonnet +++ b/vm/ci/ci_includes/vm.jsonnet @@ -53,16 +53,16 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; ], runAfter: [ 'post-merge-deploy-vm-base-java-latest-linux-amd64', - 'daily-deploy-vm-standalones-java-latest-linux-amd64', - 'daily-deploy-vm-base-java-latest-linux-aarch64', - 'daily-deploy-vm-standalones-java-latest-linux-aarch64', - 'daily-deploy-vm-base-java-latest-darwin-amd64', - 'daily-deploy-vm-standalones-java-latest-darwin-amd64', - 'daily-deploy-vm-base-java-latest-darwin-aarch64', - 'daily-deploy-vm-standalones-java-latest-darwin-aarch64', - 'daily-deploy-vm-base-java-latest-windows-amd64', - 'daily-deploy-vm-standalones-java-latest-windows-amd64', - 'daily-deploy-vm-maven-linux-amd64', + 'post-merge-deploy-vm-standalones-java-latest-linux-amd64', + 'post-merge-deploy-vm-base-java-latest-linux-aarch64', + 'post-merge-deploy-vm-standalones-java-latest-linux-aarch64', + 'post-merge-deploy-vm-base-java-latest-darwin-amd64', + 'post-merge-deploy-vm-standalones-java-latest-darwin-amd64', + 'post-merge-deploy-vm-base-java-latest-darwin-aarch64', + 'post-merge-deploy-vm-standalones-java-latest-darwin-aarch64', + 'post-merge-deploy-vm-base-java-latest-windows-amd64', + 'post-merge-deploy-vm-standalones-java-latest-windows-amd64', + 'post-merge-deploy-vm-maven-linux-amd64', ], notify_groups:: ['deploy'], }, @@ -77,7 +77,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; ['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_indexer_service('java21', 'ce'), ], runAfter: [ - 'daily-deploy-vm-maven-linux-amd64', + 'post-merge-deploy-vm-maven-linux-amd64', 'weekly-deploy-vm-base-java21-darwin-aarch64', 'weekly-deploy-vm-base-java21-darwin-amd64', 'weekly-deploy-vm-base-java21-linux-aarch64', @@ -142,8 +142,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-linux-amd64', timelimit: '1:00:00', }, - vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { - name: 'daily-deploy-vm-maven-linux-amd64', + vm_common.graalvm_complete_build_deps('ce', 'linux', 'amd64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'amd64', 'post-merge', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + name: 'post-merge-deploy-vm-maven-linux-amd64', timelimit: '1:00:00', notify_groups:: ['deploy'], }, @@ -152,8 +152,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-linux-aarch64', timelimit: '1:00:00', }, - vm_common.graalvm_complete_build_deps('ce', 'linux', 'aarch64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'aarch64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { - name: 'daily-deploy-vm-maven-linux-aarch64', + vm_common.graalvm_complete_build_deps('ce', 'linux', 'aarch64', java_version='latest') + vm_common.linux_deploy + vm_common.vm_base('linux', 'aarch64', 'post-merge', deploy=true) + vm_common.maven_deploy_base_functions.base_object('linux', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + name: 'post-merge-deploy-vm-maven-linux-aarch64', timelimit: '1:00:00', notify_groups:: ['deploy'], }, @@ -162,8 +162,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-darwin-amd64', timelimit: '1:00:00', }, - 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', + vm_common.graalvm_complete_build_deps('ce', 'darwin', 'amd64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'amd64', 'post-merge', 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: 'post-merge-deploy-vm-maven-darwin-amd64', timelimit: '1:00:00', notify_groups:: ['deploy'], }, @@ -172,8 +172,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-darwin-aarch64', timelimit: '1:00:00', }, - vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'daily', deploy=true) + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { - name: 'daily-deploy-vm-maven-darwin-aarch64', + vm_common.graalvm_complete_build_deps('ce', 'darwin', 'aarch64', java_version='latest') + vm_common.darwin_deploy + vm_common.vm_base('darwin', 'aarch64', 'post-merge', deploy=true) + vm_common.maven_deploy_base_functions.base_object('darwin', 'aarch64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + name: 'post-merge-deploy-vm-maven-darwin-aarch64', timelimit: '1:00:00', notify_groups:: ['deploy'], }, @@ -182,8 +182,8 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet'; name: 'gate-vm-maven-dry-run-windows-amd64', timelimit: '1:00:00', }, - vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'daily', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { - name: 'daily-deploy-vm-maven-windows-amd64', + vm_common.graalvm_complete_build_deps('ce', 'windows', 'amd64', java_version='latest') + vm_common.deploy_build + vm_common.vm_base('windows', 'amd64', 'post-merge', deploy=true, jdk_hint='Latest') + vm_common.maven_deploy_base_functions.base_object('windows', 'amd64', dry_run=false, remote_mvn_repo=$.maven_deploy_repository, remote_non_mvn_repo=$.binaries_repository, local_repo='local') + { + name: 'post-merge-deploy-vm-maven-windows-amd64', timelimit: '1:00:00', notify_groups:: ['deploy'], },