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

dmitry-shibanov · web-flow · commit f0bb91606209 · 2021-12-21T13:29:16.000+03:00
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();

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ export class MicrosoftDistributions extends JavaBase {`
`45`	`45`	`throw new Error('Early access versions are not supported');`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ if (this.packageType !== 'jdk') {`
	`49`	+ throw new Error('Microsoft Build of OpenJDK provides only the `jdk` package type');
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`const availableVersionsRaw = await this.getAvailableVersions();`
`49`	`53`
`50`	`54`	`const opts = this.getPlatformOption();`