Skip to content

[GR-65787] Prepare the 25.0 release branches to receive PRs. #11399

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 3 commits into from
Jun 12, 2025
Merged

[GR-65787] Prepare the 25.0 release branches to receive PRs. #11399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5bf0498
Fix version of javadoc publisher.
ansalond Jun 10, 2025
e08f181
Run relevant CI jobs post-merge.
ansalond Jun 10, 2025
160bad0
Label builds from the JDK25 release branches.
ansalond Jun 12, 2025
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
10 changes: 1 addition & 9 deletions ci_includes/publish-javadoc.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", "25.0"],
["rm", "-rf", "$GRAAL_VERSION/javadoc"],
["mkdir", "-p", "$GRAAL_VERSION/javadoc"],
["unzip", "-o", "-d", "$GRAAL_VERSION/javadoc/tmp", "$GRAAL_REPO/sdk/javadoc.zip"],
Expand Down
25 changes: 9 additions & 16 deletions vm/ci/ci_common/common-runspec.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,18 +223,11 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
# NOTE: After adding or removing deploy jobs, please make sure you modify ce-release-artifacts.json accordingly.
#
"vm-base": mx_env + deploy_graalvm_base + default_os_arch_jdk_mixin + platform_spec(no_jobs) + platform_spec({
"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'),

"darwin:amd64:jdk21": weekly,
"darwin:amd64:jdk-latest": daily,
"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'),

"windows:amd64:jdk21": weekly + timelimit('1:30:00'),
"windows:amd64:jdk-latest": daily + timelimit('1:30:00'),
"linux:aarch64:jdk-latest": post_merge + capabilities('!xgene3') + timelimit('1:30:00'),
"darwin:amd64:jdk-latest": post_merge,
"darwin:aarch64:jdk-latest": post_merge + timelimit('1:45:00') + notify_emails('bernhard.urban-forster@oracle.com'),
"windows:amd64:jdk-latest": post_merge + timelimit('1:30:00'),
}),
},

Expand All @@ -244,11 +237,11 @@ local evaluate_late(key, object) = task_spec(run_spec.evaluate_late({key:object}
#
"vm-espresso": mx_env + deploy_graalvm_espresso + espresso_java_home(21) + default_os_arch_jdk_mixin + platform_spec(no_jobs) + (
if vm.deploy_espress_standalone then platform_spec({
"linux:amd64:jdk-latest": weekly,
"linux:aarch64:jdk-latest": weekly,
"darwin:amd64:jdk-latest": weekly,
"darwin:aarch64:jdk-latest": weekly,
"windows:amd64:jdk-latest": weekly,
"linux:amd64:jdk-latest": post_merge,
"linux:aarch64:jdk-latest": post_merge,
"darwin:amd64:jdk-latest": post_merge,
"darwin:aarch64:jdk-latest": post_merge,
"windows:amd64:jdk-latest": post_merge,
}) else {}),
},

Expand Down
10 changes: 5 additions & 5 deletions vm/ci/ci_common/common.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,15 +559,15 @@ local devkits = graal_common.devkits;
#

# Linux/AMD64
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_standalones('latest', 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_standalones('latest', record_file_sizes=true) + {name: 'post-merge-deploy-vm-standalones-java-latest-linux-amd64', notify_groups:: ["deploy"]},
# Linux/AARCH64
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_standalones('latest') + {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_standalones('latest') + {name: 'post-merge-deploy-vm-standalones-java-latest-linux-aarch64', notify_groups:: ["deploy"], capabilities+: ["!xgene3"]},
# Darwin/AMD64
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_standalones('latest') + {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_standalones('latest') + {name: 'post-merge-deploy-vm-standalones-java-latest-darwin-amd64', capabilities+: ["!macmini_late_2014"], notify_groups:: ["deploy"], timelimit: '3:00:00'},
# Darwin/AARCH64
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_standalones('latest') + {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_standalones('latest') + {name: 'post-merge-deploy-vm-standalones-java-latest-darwin-aarch64', notify_groups:: ["deploy"], notify_emails+: ["bernhard.urban-forster@oracle.com"], timelimit: '3:00:00'},
# Windows/AMD64
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_standalones('latest') + 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_standalones('latest') + self.deploy_build + {name: 'post-merge-deploy-vm-standalones-java-latest-windows-amd64', timelimit: '2:30:00', notify_groups:: ["deploy"]},

local sulong_vm_tests = self.svm_common + self.sulong + vm.custom_vm + self.vm_base('linux', 'amd64', 'gate') + {
run: [
Expand Down
70 changes: 25 additions & 45 deletions vm/ci/ci_includes/vm.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,46 +41,27 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
],
},

vm_notifier_daily: vm_common.vm_base('linux', 'amd64', 'daily', deploy=true) + {
name: 'daily-deploy-vm-notifier-linux-amd64',
vm_notifier_post_merge: vm_common.vm_base('linux', 'amd64', 'post-merge', deploy=true) + {
name: 'post-merge-deploy-vm-notifier-linux-amd64',
packages+: {
curl: '==7.50.1',
},
run+: [
['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_releaser_service,
['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_indexer_service('java-latest', 'ce'),
['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'release/graal-vm/25.0', '||'] + self.ci_resources.infra.notify_indexer_service('java-25', 'ce'),
['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'cpu/graal-vm/25.0', '||'] + self.ci_resources.infra.notify_indexer_service('java-25', 'ce'),
],
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',
],
notify_groups:: ['deploy'],
},

vm_notifier_weekly: vm_common.vm_base('linux', 'amd64', 'weekly', deploy=true) + {
name: 'weekly-deploy-vm-notifier-linux-amd64',
packages+: {
curl: '==7.50.1',
},
run+: [
['test', ['git', 'rev-parse', '--abbrev-ref', 'HEAD'], '!=', 'master', '||'] + self.ci_resources.infra.notify_indexer_service('java21', 'ce'),
],
runAfter: [
'daily-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',
'weekly-deploy-vm-base-java21-linux-amd64',
'weekly-deploy-vm-base-java21-windows-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'],
},
Expand Down Expand Up @@ -135,8 +116,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'],
},
Expand All @@ -145,8 +126,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'],
},
Expand All @@ -155,8 +136,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'],
},
Expand All @@ -165,8 +146,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'],
},
Expand All @@ -175,8 +156,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'],
},
Expand Down Expand Up @@ -210,8 +191,7 @@ local graal_common = import '../../../ci/ci_common/common.jsonnet';
# Windows/AMD64
vm_common.deploy_vm_standalones_javaLatest_windows_amd64,
# Trigger the releaser service and notify the indexer
self.vm_notifier_daily,
self.vm_notifier_weekly,
self.vm_notifier_post_merge,
],

builds: [vm_common.verify_name(b) for b in vm_common.builds + vm_common_runspec.builds + vm_common_bench.builds + vm_bench.builds + vm_native.builds + utils.add_defined_in(builds, std.thisFile)],
Expand Down