Merge remote-tracking branch 'upstream/master' into shenandoah-support

Author: rkennke

.github/workflows/main.yml

@@ -92,7 +92,7 @@ permissions:
 jobs:
   build-graalvm-linux:
     name: /${{ matrix.env.PRIMARY }} ${{ matrix.env.GATE_TAGS }} JDK${{ matrix.env.JDK_VERSION }}
-    runs-on: ${{ matrix.os || 'ubuntu-20.04' }}
+    runs-on: ${{ matrix.os || 'ubuntu-22.04' }}
     timeout-minutes: 60
     strategy:
       fail-fast: false

.github/workflows/micronaut.yml

@@ -63,7 +63,7 @@ permissions:
 jobs:
   build-graalvm-and-micronaut:
     name: Native Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     steps:
     - name: Checkout oracle/graal

.github/workflows/ni-layers.yml

@@ -105,7 +105,7 @@ jobs:
       - name: Checkout oracle/graal
         uses: actions/checkout@v4
       - name: Download GraalVM JDK build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: graalvm
           path: .

.github/workflows/quarkus.yml

@@ -67,7 +67,7 @@ jobs:
       contents: read # to fetch code (actions/checkout)
 
     name: Nightly Quarkus and GraalVM build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     outputs:
       matrix: ${{ steps.read.outputs.matrix }}
@@ -133,7 +133,7 @@ jobs:
     steps:
       - name: Download GraalVM JDK build
         if: startsWith(matrix.os-name, 'ubuntu')
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: graalvm
           path: .
@@ -154,7 +154,7 @@ jobs:
         run: ${QUARKUS_PATH}/.github/ci-prerequisites.sh
       - name: Download Maven Repo
         if: startsWith(matrix.os-name, 'ubuntu')
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: maven-repo
           path: .

.github/workflows/reachability-metadata.yml

@@ -61,7 +61,7 @@ permissions:
 jobs:
   build-graalvm-and-populate-matrix:
     name: Build GraalVM and populate matrix
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
@@ -110,7 +110,7 @@ jobs:
         with:
           repository: oracle/graalvm-reachability-metadata
       - name: Download GraalVM JDK build
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
         with:
           name: graalvm
           path: .

.github/workflows/spring.yml

@@ -61,7 +61,7 @@ permissions:
 jobs:
   build-graalvm-and-spring:
     name: Native Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     if: (github.event_name == 'schedule' && github.repository == 'oracle/graal') || (github.event_name != 'schedule')
     steps:
     - name: Checkout oracle/graal

LICENSE

@@ -1,12 +1,12 @@
-          Product License  - GraalVM Community Edition
+          Product License - GraalVM Community Edition
 
 This is a release of GraalVM Community Edition. GraalVM Community Edition
 consists of multiple modules. The software as a whole, as well as the JVMCI 
 and VisualVM modules, are released under version 2 of the GNU General Public 
 License with the “Classpath” Exception. 
 The text of the foregoing licenses is reproduced below.
 
-Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2015, 2025, Oracle and/or its affiliates. All rights reserved.
 
 ===========================================================================
 

ci.jsonnet

@@ -38,6 +38,9 @@ local vm = import 'vm/ci/ci_includes/vm.jsonnet';
 # Visualizer
 local visualizer = import 'visualizer/ci/ci.jsonnet';
 
+# Web Image
+local web_image = import 'web-image/ci/ci.jsonnet';
+
 local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
 
 # Filter builds to include/exclude jobs whose name contains "libgraal"
@@ -60,7 +63,8 @@ local libgraal(builds, include=true) = [b for b in builds if (std.findSubstr("li
     common.with_components(truffle.builds, ["truffle"]) +
     common.with_components(javadoc.builds, ["javadoc"]) +
     common.with_components(libgraal(vm.builds, false), ["vm"]) +
-    common.with_components(visualizer.builds, ["visualizer"])
+    common.with_components(visualizer.builds, ["visualizer"]) +
+    common.with_components(web_image.builds, ["webimage"])
   )],
   assert verify_ci(self.builds),
   // verify that the run-spec demo works

common.json

@@ -4,11 +4,11 @@
     "Jsonnet files should not include this file directly but use ci/common.jsonnet instead."
   ],
 
-  "mx_version": "7.40.2",
+  "mx_version": "7.45.3",
 
   "COMMENT.jdks": "When adding or removing JDKs keep in sync with JDKs in ci/common.jsonnet",
   "jdks": {
-    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+12-1270", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "galahad-jdk":        {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+19-2256", "platformspecific": true, "extrabundles": ["static-libs"]},
 
     "oraclejdk17":        {"name": "jpg-jdk",   "version": "17.0.7",  "build_id": "jdk-17.0.7+8", "platformspecific": true, "extrabundles": ["static-libs"]},
     "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17.0.7+4-jvmci-23.1-b02", "platformspecific": true },
@@ -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+13", "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+13-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+13-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+13-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+13-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+13-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+13-jvmci-b01-sulong", "platformspecific": true }
+    "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "25",      "build_id": "jdk-25+20", "platformspecific": true, "extrabundles": ["static-libs"]},
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-25+20-jvmci-b01", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-25+20-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-25+20-jvmci-b01-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-25+20-jvmci-b01", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-25+20-jvmci-b01-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-25+20-jvmci-b01-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -80,7 +80,18 @@
   for suite in bench.groups.main_suites
   ],
 
-  local all_builds = main_builds + weekly_amd64_forks_builds + weekly_aarch64_forks_builds + profiling_builds + avx_builds + zgc_builds + zgc_avx_builds + aarch64_builds,
+  local metrics_suites = [bench.dacapo, bench.scala_dacapo, bench.renaissance, bench.specjvm2008],
+
+  local metrics_builds = std.flattenArrays([
+    [
+    c.weekly + hw.x52 + jdk + cc.libgraal + suite + bench.timing,
+    c.weekly + hw.x52 + jdk + cc.libgraal + suite + bench.mem_use,
+    ],
+  for jdk in cc.product_jdks
+  for suite in metrics_suites
+  ]),
+
+  local all_builds = main_builds + weekly_amd64_forks_builds + weekly_aarch64_forks_builds + profiling_builds + avx_builds + zgc_builds + zgc_avx_builds + aarch64_builds + metrics_builds,
   local filtered_builds = [b for b in all_builds if b.is_jdk_supported(b.jdk_version) && b.is_arch_supported(b.arch)],
   // adds a "defined_in" field to all builds mentioning the location of this current file
   builds:: utils.add_defined_in(filtered_builds, std.thisFile),