Merge with master.

Author: christianhaeubl

.github/actions/build-graalvm/action.yml

@@ -39,12 +39,6 @@ runs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.8'
-    - name: Update mx cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.mx
-        key: ${{ runner.os }}-mx-${{ hashFiles('**/suite.py') }}
-        restore-keys: ${{ runner.os }}-mx-
     - name: Fetch LabsJDK
       shell: bash
       run: |

.github/workflows/main.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -43,7 +43,6 @@ name: GraalVM Gate
 on:
   push:
     branches:
-      - 'master'
       - 'release/**'
     paths-ignore:
       - '.devcontainer/**'
@@ -58,6 +57,8 @@ on:
       - '**.md'
       - '**.jsonnet'
       - '**.libjsonnet'
+  schedule:
+  - cron: '30 0 * * 1'
   # Enable manual dispatch of the workflow
   # see https://docs.github.com/en/actions/managing-workflow-runs/manually-running-a-workflow
   workflow_dispatch:
@@ -77,6 +78,7 @@ concurrency:
 
 env:
   JAVA_HOME: ${{ github.workspace }}/jdk
+  TOOLS_JAVA_HOME_LOCATION: ${{ github.workspace }}/tools-jdk
   LANG: en_US.UTF-8
   MX_GIT_CACHE: refcache
   MX_PATH: ${{ github.workspace }}/mx
@@ -90,15 +92,16 @@ 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
       matrix:
         include:
           # /compiler
           - env:
-              JDK_VERSION: "21"
+              JDK_VERSION: "latest"
+              TOOLS_JDK_VERSION: "21"
               GATE_TAGS: "style,fullbuild,test"
               PRIMARY: "compiler"
           - env:
@@ -112,7 +115,8 @@ jobs:
               PRIMARY: "espresso"
           # /substratevm
           - env:
-              JDK_VERSION: "21"
+              JDK_VERSION: "latest"
+              TOOLS_JDK_VERSION: "21"
               GATE_TAGS: "style,fullbuild"
               PRIMARY: "substratevm"
           - env:
@@ -137,7 +141,7 @@ jobs:
           # /truffle
           - env:
               JDK_VERSION: "21"
-              GATE_TAGS: "" # Truffle does not use tags
+              GATE_TAGS: "style,fullbuild,fulltest"
               PRIMARY: "truffle"
           # /vm
           - env:
@@ -179,17 +183,16 @@ jobs:
       uses: actions/setup-python@v5
       with:
         python-version: '3.8'
-    - name: Update mx cache
-      uses: actions/cache@v4
-      with:
-        path: ~/.mx
-        key: ${{ runner.os }}-mx-${{ hashFiles('**/suite.py') }}
-        restore-keys: ${{ runner.os }}-mx-
     - name: Fetch LabsJDK
       env: ${{ matrix.env }}
       run: |
         mkdir jdk-dl
         ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${JDK_VERSION} --to jdk-dl --alias ${JAVA_HOME}
+    - name: Fetch Tools JDK
+      env: ${{ matrix.env }}
+      if: ${{ matrix.env.TOOLS_JDK_VERSION != '' }}
+      run: |
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-${TOOLS_JDK_VERSION} --to jdk-dl --alias ${TOOLS_JAVA_HOME_LOCATION}
     - name: Update dependency cache
       if: ${{ env.MX_RUNS_DEBUG == 'true' || env.MX_RUNS_STYLE == 'true' }}
       run: sudo apt update
@@ -218,7 +221,7 @@ jobs:
       run: rm -rf .git
     - name: Build GraalVM and run gate with tags
       env: ${{ matrix.env }}
-      run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
+      run: ${MX_PATH}/mx --primary-suite-path ${PRIMARY} --java-home=${JAVA_HOME} --tools-java-home=${{ matrix.env.TOOLS_JDK_VERSION != '' && env.TOOLS_JAVA_HOME_LOCATION || '' }} gate --strict-mode ${{ matrix.env.GATE_OPTS }} --tags ${GATE_TAGS}
       if: ${{ matrix.env.GATE_TAGS != '' }}
     - name: Build GraalVM and run gate without tags
       env: ${{ matrix.env }}
@@ -230,6 +233,7 @@ jobs:
     timeout-minutes: 60
     env:
       MX_PYTHON: 'python'
+      PYTHONIOENCODING: 'utf-8'
     steps:
     - name: Checkout oracle/graal
       uses: actions/checkout@v4

.github/workflows/micronaut.yml

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Micronaut Tests
+name: Weekly Micronaut Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/micronaut.yml'
   schedule:
-  - cron: '0 2 * * *'
+  - cron: '0 2 * * 1'
   workflow_dispatch:
 
 env:
@@ -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

@@ -44,9 +44,11 @@ on:
   push:
     paths:
       - '.github/workflows/ni-layers.yml'
+      - 'vm/tests/gh_workflows/NILayerTests/**'
   pull_request:
     paths:
       - '.github/workflows/ni-layers.yml'
+      - 'vm/tests/gh_workflows/NILayerTests/**'
   schedule:
   - cron: "0 0 * * 1" # Once a week, at midnight on Monday (00:00 UTC)
   workflow_dispatch:
@@ -103,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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2020, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Quarkus Tests
+name: Weekly Quarkus Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/quarkus.yml'
   schedule:
-  - cron: '0 3 * * *'
+  - cron: '0 3 * * 1'
   workflow_dispatch:
 
 env:
@@ -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

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2024, 2024, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2024, 2025, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # The Universal Permissive License (UPL), Version 1.0
@@ -38,7 +38,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 #
-name: Nightly Spring Tests
+name: Weekly Spring Tests
 
 on:
   push:
@@ -48,7 +48,7 @@ on:
     paths:
       - '.github/workflows/spring.yml'
   schedule:
-  - cron: '0 4 * * *'
+  - cron: '0 4 * * 1'
   workflow_dispatch:
 
 env:
@@ -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

ci/ci_common/bench-common.libsonnet

@@ -6,7 +6,7 @@
   bench_base:: common.build_base + {
     # job name automatically generated: <job_prefix>-<suite>-<platform>-<jdk_name>-<os>-<arch>-<job_suffix>
     # null values are omitted from the list.
-    generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, self.jdk_name, self.os, self.arch, self.job_suffix]),
+    generated_name:: utils.hyphenize([self.job_prefix, self.suite, self.platform, self.jdk_name, if std.objectHasAll(self, 'machine_name') then self.machine_name else null, self.os, self.arch, self.job_suffix]),
     job_prefix:: null,
     job_suffix:: null,
     name:
@@ -69,6 +69,13 @@
       default_numa_node:: 0,
       num_threads:: 16
     },
+    x52:: common.linux_amd64 + self._bench_machine + {
+      machine_name:: "x52",
+      capabilities+: ["tmpfs25g"],
+      numa_nodes:: [0, 1],
+      default_numa_node:: 1,
+      num_threads:: 72
+    },
     x82:: common.linux_amd64 + self._bench_machine + {
       machine_name:: "x82",
       capabilities+: ["tmpfs25g"],

ci/ci_common/common-utils.libsonnet

@@ -10,6 +10,15 @@
   hyphenize(a_list)::
     std.join("-", std.filterMap(function(el) el != null, function(el) std.toString(el), a_list)),
 
+  # generate a string that describes the specific hardware being executed on with format: <jdk_name>-<machine_name>-<os>-<arch>
+  jdk_and_hardware(build)::
+    self.hyphenize([
+      if std.objectHasAll(build, 'jdk_name') then build.jdk_name else null,
+      if std.objectHasAll(build, 'machine_name') then build.machine_name else null,
+      if std.objectHasAll(build, 'os') then build.os else null,
+      if std.objectHasAll(build, 'arch') then build.arch else null,
+    ]),
+
   # Pattern for a guard.includes clause that captures all top-level CI files.
   top_level_ci:: ["*.json", "*.jsonnet", "*.libsonnet", "ci/**"],
 

ci/ci_common/common.jsonnet

@@ -111,6 +111,7 @@ common + common.frequencies + {
   labsjdk21::            self["labsjdk-" + repo_config.graalvm_edition + "-21"],
   labsjdk21Debug::       self["labsjdk-" + repo_config.graalvm_edition + "-21Debug"],
   labsjdk21LLVM::        self["labsjdk-" + repo_config.graalvm_edition + "-21-llvm"],
+  graalvmee21::          self["graalvm-ee-21"],
 
   labsjdkLatest::            self["labsjdk-" + repo_config.graalvm_edition + "-latest"],
   labsjdkLatestDebug::       self["labsjdk-" + repo_config.graalvm_edition + "-latestDebug"],

ci/common.jsonnet

@@ -152,6 +152,8 @@ local common_json = import "../common.json";
         "@(?P<filename>.*SubprocessUtil-argfiles.*\\.argfile)",
         # Keep in sync with com.oracle.truffle.api.test.SubprocessTestUtils#makeArgfile
         "@(?P<filename>.*SubprocessTestUtils-argfiles.*\\.argfile)",
+        # Keep in sync with mx_gate.py:get_jacoco_agent_args
+        "JaCoCo agent config: '(?P<filename>[^']+)'",
       ],
     },
 
@@ -284,7 +286,7 @@ local common_json = import "../common.json";
         if (self.os == "linux" && self.arch == "amd64") then {
           readline: '==6.3',
           pcre2: '==10.37',
-          curl: '>=7.50.1',
+          curl: '==7.50.1',
           gnur: '==4.0.3-gcc4.8.5-pcre2',
         }
         else if (self.os == "darwin" && self.arch == "amd64") then {

ci_includes/publish-javadoc.jsonnet

@@ -4,7 +4,7 @@
   local linux_amd64 = common.linux_amd64,
 
   local javadoc_publisher = {
-    name: 'graal-publish-javadoc-' + utils.prefixed_jdk(self.jdk_version),
+    name: 'graal-publish-javadoc-' + self.jdk_name,
     run+: [
       ["cd", "./sdk"],
       ["mx", "build"],
@@ -59,7 +59,7 @@
   },
 
   local all_builds = [
-    common.post_merge + linux_amd64 + common.labsjdk21 + javadoc_publisher,
+    common.post_merge + linux_amd64 + common.labsjdkLatest + javadoc_publisher,
   ],
   // adds a "defined_in" field to all builds mentioning the location of this current file
   builds:: utils.add_defined_in(all_builds, std.thisFile),