From 95d459693ac5f8add3d876b0b299a382c54169af Mon Sep 17 00:00:00 2001 From: ol-automation_ww Date: Thu, 20 Feb 2025 20:47:00 +0000 Subject: [PATCH 1/3] update JVMCI to 25+11-jvmci-b01 --- common.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common.json b/common.json index da674887b3bc..bebfc756feb5 100644 --- a/common.json +++ b/common.json @@ -45,13 +45,13 @@ "oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]}, - "oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+10", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+10-jvmci-b01-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+10-jvmci-b01-sulong", "platformspecific": true } + "oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+11", "platformspecific": true, "extrabundles": ["static-libs"]}, + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9-sulong", "platformspecific": true } }, "eclipse": { From c082730303771ceeed91083fdea61b9f5ebbb705 Mon Sep 17 00:00:00 2001 From: jovsteva Date: Fri, 21 Feb 2025 08:34:33 +0100 Subject: [PATCH 2/3] Update JVMCI version. --- .../src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java index ad2267c3168b..4dd2477d4850 100644 --- a/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java +++ b/compiler/src/jdk.graal.compiler/src/jdk/graal/compiler/hotspot/JVMCIVersionCheck.java @@ -56,8 +56,8 @@ public final class JVMCIVersionCheck { private static final Map> JVMCI_MIN_VERSIONS = Map.of( "21", Map.of(DEFAULT_VENDOR_ENTRY, createLegacyVersion(23, 1, 33)), "25", Map.of( - "Oracle Corporation", createLabsJDKVersion("25+10", 1), - DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+10", 1))); + "Oracle Corporation", createLabsJDKVersion("25+11", 1), + DEFAULT_VENDOR_ENTRY, createLabsJDKVersion("25+11", 1))); private static final int NA = 0; /** * Minimum Java release supported by Graal. From 761098c977510f13743882a3cc929c5988da9db1 Mon Sep 17 00:00:00 2001 From: Marouane El Hallaoui Date: Fri, 21 Feb 2025 12:55:36 +0100 Subject: [PATCH 3/3] deploy labsjdk snapshots --- common.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/common.json b/common.json index bebfc756feb5..7a08d2915bc0 100644 --- a/common.json +++ b/common.json @@ -46,12 +46,12 @@ "oraclejdk23": {"name": "jpg-jdk", "version": "23", "build_id": "jdk-23+37", "platformspecific": true, "extrabundles": ["static-libs"]}, "oraclejdk-latest": {"name": "jpg-jdk", "version": "25", "build_id": "jdk-25+11", "platformspecific": true, "extrabundles": ["static-libs"]}, - "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d", "platformspecific": true }, - "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d-debug", "platformspecific": true }, - "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-20250220180509-2508de479d-sulong", "platformspecific": true }, - "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9", "platformspecific": true }, - "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9-debug", "platformspecific": true }, - "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-20250220180509-2508de479d+2cbd2536d9-sulong", "platformspecific": true } + "labsjdk-ce-latest": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01", "platformspecific": true }, + "labsjdk-ce-latestDebug": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ce-latest-llvm": {"name": "labsjdk", "version": "ce-25+11-jvmci-b01-sulong", "platformspecific": true }, + "labsjdk-ee-latest": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01", "platformspecific": true }, + "labsjdk-ee-latestDebug": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-debug", "platformspecific": true }, + "labsjdk-ee-latest-llvm": {"name": "labsjdk", "version": "ee-25+11-jvmci-b01-sulong", "platformspecific": true } }, "eclipse": {