msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11

actions · Jun 9, 2022 · 1155606 · 1155606
1 parent ec303d3
commit 1155606
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -101717,21 +101717,24 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
             // TODO get these dynamically!
             // We will need Microsoft to add an endpoint where we can query for versions.
             const jdkVersions = [
+                {
+                    version: [17, 0, 3]
+                },
                 {
                     version: [17, 0, 1, 12, 1]
                 },
                 {
                     version: [16, 0, 2, 7, 1]
+                },
+                {
+                    version: [11, 0, 15]
                 }
             ];
             // M1 is only supported for Java 16 & 17
             if (process.platform !== 'darwin' || this.architecture !== 'aarch64') {
                 jdkVersions.push({
                     version: [11, 0, 13, 8, 1]
                 });
-                jdkVersions.push({
-                    version: [11, 0, 15]
-                });
             }
             return jdkVersions;
         });

diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts
@@ -80,11 +80,17 @@ export class MicrosoftDistributions extends JavaBase {
     // TODO get these dynamically!
     // We will need Microsoft to add an endpoint where we can query for versions.
     const jdkVersions = [
+      {
+        version: [17, 0, 3]
+      },
       {
         version: [17, 0, 1, 12, 1]
       },
       {
         version: [16, 0, 2, 7, 1]
+      },
+      {
+        version: [11, 0, 15]
       }
     ];
 
@@ -93,9 +99,6 @@ export class MicrosoftDistributions extends JavaBase {
       jdkVersions.push({
         version: [11, 0, 13, 8, 1]
       });
-      jdkVersions.push({
-        version: [11, 0, 15]
-      });
     }
 
     return jdkVersions;