Add an error condition for non jdk Microsoft OpenJDK build (#265)

actions · Dec 21, 2021 · f0bb916 · f0bb916
1 parent d23aed3
commit f0bb916
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -13889,6 +13889,9 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
             if (!this.stable) {
                 throw new Error('Early access versions are not supported');
             }
+            if (this.packageType !== 'jdk') {
+                throw new Error('Microsoft Build of OpenJDK provides only the `jdk` package type');
+            }
             const availableVersionsRaw = yield this.getAvailableVersions();
             const opts = this.getPlatformOption();
             const availableVersions = availableVersionsRaw.map(item => ({

diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md
@@ -65,6 +65,17 @@ steps:
 - run: java -cp java HelloWorldApp
 ```
 
+### Microsoft
+```yaml
+steps:
+- uses: actions/checkout@v2
+- uses: actions/setup-java@v2
+  with:
+    distribution: 'microsoft'
+    java-version: '11'
+- run: java -cp java HelloWorldApp
+```
+
 ## Installing custom Java package type
 ```yaml
 steps:

diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts
@@ -45,6 +45,10 @@ export class MicrosoftDistributions extends JavaBase {
       throw new Error('Early access versions are not supported');
     }
 
+    if (this.packageType !== 'jdk') {
+      throw new Error('Microsoft Build of OpenJDK provides only the `jdk` package type');
+    }
+
     const availableVersionsRaw = await this.getAvailableVersions();
 
     const opts = this.getPlatformOption();