Merge 5c0c676eaf into ead9eaa3cf

2025-09-17 20:48:42 +08:00
4 changed files with 121 additions and 221 deletions
--- a/.github/workflows/e2e-versions.yml
+++ b/.github/workflows/e2e-versions.yml
@ -41,15 +41,6 @@ jobs:
          - distribution: dragonwell
            os: macos-13
        include:
-          - distribution: microsoft
-            os: windows-latest
-            version: 25
-          - distribution: microsoft
-            os: ubuntu-latest
-            version: 25
-          - distribution: microsoft
-            os: macos-latest
-            version: 25
          - distribution: oracle
            os: macos-13
            version: 17
--- a/tests/data/microsoft.json
+++ b/tests/data/microsoft.json
@ -1,47 +1,4 @@
 [
-    {
-      "version": "25.0.0",
-      "stable": true,
-      "release_url": "https://aka.ms/download-jdk",
-      "files": [
-        {
-          "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
-          "arch": "x64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
-          "arch": "x64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
-          "arch": "x64",
-          "platform": "win32",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "darwin",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
-          "arch": "aarch64",
-          "platform": "linux",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
-        },
-        {
-          "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
-          "arch": "aarch64",
-          "platform": "win32",
-          "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
-        }
-      ]
-    },
    {
      "version": "21.0.0",
      "stable": true,
--- a/tests/distributors/microsoft-installer.test.ts
+++ b/tests/distributors/microsoft-installer.test.ts
@ -29,11 +29,6 @@ describe('findPackageForDownload', () => {
  });

  it.each([
-    [
-      '25.x',
-      '25.0.0',
-      'https://aka.ms/download-jdk/microsoft-jdk-25.0.0-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
-    ],
    [
      '21.x',
      '21.0.0',
--- a/src/distributions/microsoft/microsoft-openjdk-versions.json
+++ b/src/distributions/microsoft/microsoft-openjdk-versions.json
@ -1,133 +1,90 @@
 [
  {
-    "version": "25.0.0",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-25.0.0-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-25.0.0-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-25.0.0-windows-aarch64.zip"
-      }
-    ]
-  },
+  "version": "21.0.2",
+  "stable": true,
+  "release_url": "https://aka.ms/download-jdk",
+  "files": [
+    {
+      "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
+    }
+  ]
+},
  {
-    "version": "21.0.2",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-21.0.2-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.2-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.2-windows-aarch64.zip"
-      }
-    ]
-  },
-  {
-    "version": "21.0.1",
-    "stable": true,
-    "release_url": "https://aka.ms/download-jdk",
-    "files": [
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
-      }
-    ]
-  },
+  "version": "21.0.1",
+  "stable": true,
+  "release_url": "https://aka.ms/download-jdk",
+  "files": [
+    {
+      "filename": "microsoft-jdk-21.0.1-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-21.0.1-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-21.0.1-windows-aarch64.zip"
+    }
+  ]
+},
  {
    "version": "21.0.0",
    "stable": true,
@ -219,42 +176,42 @@
    "stable": true,
    "release_url": "https://aka.ms/download-jdk",
    "files": [
-      {
-        "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
-        "arch": "x64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
-        "arch": "x64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
-        "arch": "x64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "darwin",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
-        "arch": "aarch64",
-        "platform": "linux",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
-      },
-      {
-        "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
-        "arch": "aarch64",
-        "platform": "win32",
-        "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
-      }
+    {
+      "filename": "microsoft-jdk-17.0.9-macos-x64.tar.gz",
+      "arch": "x64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-linux-x64.tar.gz",
+      "arch": "x64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-x64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-windows-x64.zip",
+      "arch": "x64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-x64.zip"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-macos-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "darwin",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-macos-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-linux-aarch64.tar.gz",
+      "arch": "aarch64",
+      "platform": "linux",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-linux-aarch64.tar.gz"
+    },
+    {
+      "filename": "microsoft-jdk-17.0.9-windows-aarch64.zip",
+      "arch": "aarch64",
+      "platform": "win32",
+      "download_url": "https://aka.ms/download-jdk/microsoft-jdk-17.0.9-windows-aarch64.zip"
+    }
    ]
  },
  {
@ -878,4 +835,4 @@
      }
    ]
  }
-]
+]