From f153d323ee643c7456b7d682faa8d0039b7bd915 Mon Sep 17 00:00:00 2001 From: wenytang-ms Date: Sun, 20 Sep 2026 10:38:29 +0800 Subject: [PATCH] Upgrade CI runtime to JDK 25 --- .azure-pipelines/ci.yml | 8 ++++---- .azure-pipelines/nightly.yml | 12 ++++++------ .azure-pipelines/rc.yml | 12 ++++++------ .github/workflows/e2eUI.yml | 20 ++++++++++---------- .github/workflows/linux.yml | 4 ++-- .github/workflows/macOS.yml | 4 ++-- .github/workflows/windows.yml | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.azure-pipelines/ci.yml b/.azure-pipelines/ci.yml index 1eefb7f2..be27833b 100644 --- a/.azure-pipelines/ci.yml +++ b/.azure-pipelines/ci.yml @@ -62,9 +62,9 @@ extends: - checkout: self fetchTags: false - task: JavaToolInstaller@0 - displayName: Use Java 21 + displayName: Use Java 25 inputs: - versionSpec: "21" + versionSpec: "25" jdkArchitectureOption: x64 jdkSourceOption: PreInstalled - task: NodeTool@0 @@ -94,9 +94,9 @@ extends: - checkout: self fetchTags: false - task: JavaToolInstaller@0 - displayName: Use Java 21 + displayName: Use Java 25 inputs: - versionSpec: "21" + versionSpec: "25" jdkArchitectureOption: x64 jdkSourceOption: PreInstalled - task: NodeTool@0 diff --git a/.azure-pipelines/nightly.yml b/.azure-pipelines/nightly.yml index a1ee16a2..ee37a3ec 100644 --- a/.azure-pipelines/nightly.yml +++ b/.azure-pipelines/nightly.yml @@ -53,20 +53,20 @@ extends: versionSpec: 20.x # The image does not have jdk preinstalled, we need to download it first. - task: PowerShell@2 - displayName: Download JDK 21 + displayName: Download JDK 25 inputs: targetType: 'inline' script: |- New-Item -ItemType Directory -Path "$env:AGENT_TEMPDIRECTORY\downloadjdk" - Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-21-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-21-windows-x64.zip" + Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-25-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-25-windows-x64.zip" - task: JavaToolInstaller@0 - displayName: Use Java 21 + displayName: Use Java 25 inputs: - versionSpec: "21" + versionSpec: "25" jdkArchitectureOption: x64 jdkSourceOption: LocalDirectory - jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-21-windows-x64.zip - jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk21 + jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-25-windows-x64.zip + jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk25 - script: java --version displayName: 'Check Java installation' - template: /.azure-pipelines/npm-cfs.yml@self diff --git a/.azure-pipelines/rc.yml b/.azure-pipelines/rc.yml index 59286c81..19a1bfab 100644 --- a/.azure-pipelines/rc.yml +++ b/.azure-pipelines/rc.yml @@ -48,20 +48,20 @@ extends: versionSpec: 20.x # The image does not have jdk preinstalled, we need to download it first. - task: PowerShell@2 - displayName: Download JDK 21 + displayName: Download JDK 25 inputs: targetType: 'inline' script: |- New-Item -ItemType Directory -Path "$env:AGENT_TEMPDIRECTORY\downloadjdk" - Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-21-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-21-windows-x64.zip" + Invoke-WebRequest -Uri "https://aka.ms/download-jdk/microsoft-jdk-25-windows-x64.zip" -OutFile "$env:AGENT_TEMPDIRECTORY\downloadjdk\microsoft-jdk-25-windows-x64.zip" - task: JavaToolInstaller@0 - displayName: Use Java 21 + displayName: Use Java 25 inputs: - versionSpec: "21" + versionSpec: "25" jdkArchitectureOption: x64 jdkSourceOption: LocalDirectory - jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-21-windows-x64.zip - jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk21 + jdkFile: $(Agent.TempDirectory)/downloadjdk/microsoft-jdk-25-windows-x64.zip + jdkDestinationDirectory: $(Agent.ToolsDirectory)/ms-jdk25 - script: java --version displayName: 'Check Java installation' - template: /.azure-pipelines/npm-cfs.yml@self diff --git a/.github/workflows/e2eUI.yml b/.github/workflows/e2eUI.yml index efa375c5..8bb87697 100644 --- a/.github/workflows/e2eUI.yml +++ b/.github/workflows/e2eUI.yml @@ -34,10 +34,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Setup Node.js environment @@ -80,10 +80,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Setup Node.js environment @@ -118,10 +118,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Setup Node.js environment @@ -162,10 +162,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Setup Node.js environment @@ -217,10 +217,10 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: - java-version: '21' + java-version: '25' distribution: 'temurin' - name: Setup Node.js environment diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index a5d08fb7..ecfec25f 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -21,11 +21,11 @@ jobs: sudo /usr/bin/Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 & sleep 3 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Setup Node.js environment uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 diff --git a/.github/workflows/macOS.yml b/.github/workflows/macOS.yml index bee4d210..6bea43e7 100644 --- a/.github/workflows/macOS.yml +++ b/.github/workflows/macOS.yml @@ -14,11 +14,11 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Setup Node.js environment uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0 diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a192d9f0..902dd582 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -14,11 +14,11 @@ jobs: steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 - - name: Set up JDK 21 + - name: Set up JDK 25 uses: actions/setup-java@de7274f081f381c8f8158605e0321c36c376e2e6 # v6.0.1 with: distribution: 'temurin' - java-version: '21' + java-version: '25' - name: Setup Node.js environment uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0