Skip to content

Commit cbc183b

Browse files
MarcelCodingMarcelCoding
authored
Added 'adopt-hotspot' and 'adopt-openj9' (#155)
* Added 'adopt-hotspot' and 'adopt-openj9' * Fixed adopt toolchain folder
1 parent 0443912 commit cbc183b

File tree

7 files changed

+139
-64
lines changed

7 files changed

+139
-64
lines changed

‎.github/workflows/e2e-versions.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
os: [macos-latest, windows-latest, ubuntu-latest]
22-
distribution: ['adopt', 'zulu']
22+
distribution: ['adopt', 'adopt-openj9', 'zulu'] # internally 'adopt-hotspot' is the same as 'adopt'
2323
version: ['8', '11', '15']
2424
steps:
2525
- name: Checkout
@@ -92,7 +92,7 @@ jobs:
9292
- name: Verify Java
9393
run: bash __tests__/verify-java.sh "11" "${{ steps.setup-java.outputs.path }}"
9494
shell: bash
95-
95+
9696
setup-java-ea-versions-zulu:
9797
name: zulu ${{ matrix.version }} (jdk-x64) - ${{ matrix.os }}
9898
needs: setup-java-major-minor-versions
@@ -195,4 +195,4 @@ jobs:
195195
architecture: x86
196196
- name: Verify Java
197197
run: bash __tests__/verify-java.sh "${{ matrix.version }}" "${{ steps.setup-java.outputs.path }}"
198-
shell: bash
198+
shell: bash

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ Currently, the following distributions are supported:
5353
| Keyword | Distribution | Official site | License |
5454
|-|-|-|-|
5555
| `zulu` | Zulu OpenJDK | [Link](https://www.azul.com/downloads/zulu-community/?package=jdk) | [Link](https://www.azul.com/products/zulu-and-zulu-enterprise/zulu-terms-of-use/) |
56-
| `adopt` | Adopt OpenJDK | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
56+
| `adopt` or `adopt-hotspot` | Adopt OpenJDK Hotspot | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
57+
| `adopt-openj9` | Adopt OpenJDK OpenJ9 | [Link](https://adoptopenjdk.net/) | [Link](https://adoptopenjdk.net/about.html)
5758

5859
**NOTE:** The different distributors can provide discrepant list of available versions / supported configurations. Please refer to the official documentation to see the list of supported versions.
5960

‎__tests__/distributors/adopt-installer.test.ts‎

Lines changed: 74 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import { HttpClient } from '@actions/http-client';
22

3-
import * as semver from 'semver';
4-
5-
import { AdoptDistribution } from '../../src/distributions/adopt/installer';
3+
import { AdoptDistribution, AdoptImplementation } from '../../src/distributions/adopt/installer';
64
import { JavaInstallerOptions } from '../../src/distributions/base-models';
75

86
let manifestData = require('../data/adopt.json') as [];
@@ -28,26 +26,54 @@ describe('getAvailableVersions', () => {
2826
it.each([
2927
[
3028
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
31-
'os=mac&architecture=x64&image_type=jdk&release_type=ga&page_size=20&page=0'
29+
AdoptImplementation.Hotspot,
30+
'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
3231
],
3332
[
3433
{ version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
35-
'os=mac&architecture=x86&image_type=jdk&release_type=ga&page_size=20&page=0'
34+
AdoptImplementation.Hotspot,
35+
'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
3636
],
3737
[
3838
{ version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false },
39-
'os=mac&architecture=x64&image_type=jre&release_type=ga&page_size=20&page=0'
39+
AdoptImplementation.Hotspot,
40+
'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=hotspot&page_size=20&page=0'
4041
],
4142
[
4243
{ version: '11-ea', architecture: 'x64', packageType: 'jdk', checkLatest: false },
43-
'os=mac&architecture=x64&image_type=jdk&release_type=ea&page_size=20&page=0'
44+
AdoptImplementation.Hotspot,
45+
'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=hotspot&page_size=20&page=0'
46+
],
47+
[
48+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
49+
AdoptImplementation.OpenJ9,
50+
'os=mac&architecture=x64&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
51+
],
52+
[
53+
{ version: '11', architecture: 'x86', packageType: 'jdk', checkLatest: false },
54+
AdoptImplementation.OpenJ9,
55+
'os=mac&architecture=x86&image_type=jdk&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
56+
],
57+
[
58+
{ version: '11', architecture: 'x64', packageType: 'jre', checkLatest: false },
59+
AdoptImplementation.OpenJ9,
60+
'os=mac&architecture=x64&image_type=jre&release_type=ga&jvm_impl=openj9&page_size=20&page=0'
61+
],
62+
[
63+
{ version: '11-ea', architecture: 'x64', packageType: 'jdk', checkLatest: false },
64+
AdoptImplementation.OpenJ9,
65+
'os=mac&architecture=x64&image_type=jdk&release_type=ea&jvm_impl=openj9&page_size=20&page=0'
4466
]
4567
])(
4668
'build correct url for %s',
47-
async (installerOptions: JavaInstallerOptions, expectedParameters) => {
48-
const distribution = new AdoptDistribution(installerOptions);
69+
async (
70+
installerOptions: JavaInstallerOptions,
71+
impl: AdoptImplementation,
72+
expectedParameters
73+
) => {
74+
const distribution = new AdoptDistribution(installerOptions, impl);
4975
const baseUrl = 'https://api.adoptopenjdk.net/v3/assets/version/%5B1.0,100.0%5D';
50-
const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&jvm_impl=hotspot&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
76+
const expectedUrl = `${baseUrl}?project=jdk&vendor=adoptopenjdk&heap_size=normal&sort_method=DEFAULT&sort_order=DESC&${expectedParameters}`;
5177
distribution['getPlatformOption'] = () => 'mac';
5278

5379
await distribution['getAvailableVersions']();
@@ -76,16 +102,32 @@ describe('getAvailableVersions', () => {
76102
result: []
77103
});
78104

79-
const distribution = new AdoptDistribution({
80-
version: '11',
81-
architecture: 'x64',
82-
packageType: 'jdk',
83-
checkLatest: false
84-
});
105+
const distribution = new AdoptDistribution(
106+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
107+
AdoptImplementation.Hotspot
108+
);
85109
const availableVersions = await distribution['getAvailableVersions']();
86110
expect(availableVersions).not.toBeNull();
87111
expect(availableVersions.length).toBe(manifestData.length * 2);
88112
});
113+
114+
it.each([
115+
[AdoptImplementation.Hotspot, 'jdk', 'Java_Adopt_jdk'],
116+
[AdoptImplementation.Hotspot, 'jre', 'Java_Adopt_jre'],
117+
[AdoptImplementation.OpenJ9, 'jdk', 'Java_Adopt-OpenJ9_jdk'],
118+
[AdoptImplementation.OpenJ9, 'jre', 'Java_Adopt-OpenJ9_jre']
119+
])(
120+
'find right toolchain folder',
121+
(impl: AdoptImplementation, packageType: string, expected: string) => {
122+
const distribution = new AdoptDistribution(
123+
{ version: '11', architecture: 'x64', packageType: packageType, checkLatest: false },
124+
impl
125+
);
126+
127+
// @ts-ignore - because it is protected
128+
expect(distribution.toolcacheFolderName).toBe(expected);
129+
}
130+
);
89131
});
90132

91133
describe('findPackageForDownload', () => {
@@ -102,50 +144,42 @@ describe('findPackageForDownload', () => {
102144
['15.0.1+9', '15.0.1+9'],
103145
['15.0.1+9.1', '15.0.1+9.1']
104146
])('version is resolved correctly %s -> %s', async (input, expected) => {
105-
const distribution = new AdoptDistribution({
106-
version: '11',
107-
architecture: 'x64',
108-
packageType: 'jdk',
109-
checkLatest: false
110-
});
147+
const distribution = new AdoptDistribution(
148+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
149+
AdoptImplementation.Hotspot
150+
);
111151
distribution['getAvailableVersions'] = async () => manifestData;
112152
const resolvedVersion = await distribution['findPackageForDownload'](input);
113153
expect(resolvedVersion.version).toBe(expected);
114154
});
115155

116156
it('version is found but binaries list is empty', async () => {
117-
const distribution = new AdoptDistribution({
118-
version: '11',
119-
architecture: 'x64',
120-
packageType: 'jdk',
121-
checkLatest: false
122-
});
157+
const distribution = new AdoptDistribution(
158+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
159+
AdoptImplementation.Hotspot
160+
);
123161
distribution['getAvailableVersions'] = async () => manifestData;
124162
await expect(distribution['findPackageForDownload']('9.0.8')).rejects.toThrowError(
125163
/Could not find satisfied version for SemVer */
126164
);
127165
});
128166

129167
it('version is not found', async () => {
130-
const distribution = new AdoptDistribution({
131-
version: '11',
132-
architecture: 'x64',
133-
packageType: 'jdk',
134-
checkLatest: false
135-
});
168+
const distribution = new AdoptDistribution(
169+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
170+
AdoptImplementation.Hotspot
171+
);
136172
distribution['getAvailableVersions'] = async () => manifestData;
137173
await expect(distribution['findPackageForDownload']('7.x')).rejects.toThrowError(
138174
/Could not find satisfied version for SemVer */
139175
);
140176
});
141177

142178
it('version list is empty', async () => {
143-
const distribution = new AdoptDistribution({
144-
version: '11',
145-
architecture: 'x64',
146-
packageType: 'jdk',
147-
checkLatest: false
148-
});
179+
const distribution = new AdoptDistribution(
180+
{ version: '11', architecture: 'x64', packageType: 'jdk', checkLatest: false },
181+
AdoptImplementation.Hotspot
182+
);
149183
distribution['getAvailableVersions'] = async () => [];
150184
await expect(distribution['findPackageForDownload']('11')).rejects.toThrowError(
151185
/Could not find satisfied version for SemVer */

‎dist/setup/index.js‎

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,23 +1476,28 @@ exports.string = string;
14761476

14771477
Object.defineProperty(exports, "__esModule", { value: true });
14781478
exports.getJavaDistribution = void 0;
1479-
const installer_1 = __webpack_require__(584);
1480-
const installer_2 = __webpack_require__(144);
1481-
const installer_3 = __webpack_require__(393);
1479+
const installer_1 = __webpack_require__(144);
1480+
const installer_2 = __webpack_require__(393);
1481+
const installer_3 = __webpack_require__(584);
14821482
var JavaDistribution;
14831483
(function (JavaDistribution) {
14841484
JavaDistribution["Adopt"] = "adopt";
1485+
JavaDistribution["AdoptHotspot"] = "adopt-hotspot";
1486+
JavaDistribution["AdoptOpenJ9"] = "adopt-openj9";
14851487
JavaDistribution["Zulu"] = "zulu";
14861488
JavaDistribution["JdkFile"] = "jdkfile";
14871489
})(JavaDistribution || (JavaDistribution = {}));
14881490
function getJavaDistribution(distributionName, installerOptions, jdkFile) {
14891491
switch (distributionName) {
14901492
case JavaDistribution.JdkFile:
1491-
return new installer_2.LocalDistribution(installerOptions, jdkFile);
1493+
return new installer_1.LocalDistribution(installerOptions, jdkFile);
14921494
case JavaDistribution.Adopt:
1493-
return new installer_1.AdoptDistribution(installerOptions);
1495+
case JavaDistribution.AdoptHotspot:
1496+
return new installer_3.AdoptDistribution(installerOptions, installer_3.AdoptImplementation.Hotspot);
1497+
case JavaDistribution.AdoptOpenJ9:
1498+
return new installer_3.AdoptDistribution(installerOptions, installer_3.AdoptImplementation.OpenJ9);
14941499
case JavaDistribution.Zulu:
1495-
return new installer_3.ZuluDistribution(installerOptions);
1500+
return new installer_2.ZuluDistribution(installerOptions);
14961501
default:
14971502
return null;
14981503
}
@@ -26889,17 +26894,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
2688926894
return (mod && mod.__esModule) ? mod : { "default": mod };
2689026895
};
2689126896
Object.defineProperty(exports, "__esModule", { value: true });
26892-
exports.AdoptDistribution = void 0;
26897+
exports.AdoptDistribution = exports.AdoptImplementation = void 0;
2689326898
const core = __importStar(__webpack_require__(470));
2689426899
const tc = __importStar(__webpack_require__(139));
2689526900
const fs_1 = __importDefault(__webpack_require__(747));
2689626901
const path_1 = __importDefault(__webpack_require__(622));
2689726902
const semver_1 = __importDefault(__webpack_require__(876));
2689826903
const base_installer_1 = __webpack_require__(83);
2689926904
const util_1 = __webpack_require__(322);
26905+
var AdoptImplementation;
26906+
(function (AdoptImplementation) {
26907+
AdoptImplementation["Hotspot"] = "Hotspot";
26908+
AdoptImplementation["OpenJ9"] = "OpenJ9";
26909+
})(AdoptImplementation = exports.AdoptImplementation || (exports.AdoptImplementation = {}));
2690026910
class AdoptDistribution extends base_installer_1.JavaBase {
26901-
constructor(installerOptions) {
26902-
super('Adopt', installerOptions);
26911+
constructor(installerOptions, jvmImpl) {
26912+
super(`Adopt-${jvmImpl}`, installerOptions);
26913+
this.jvmImpl = jvmImpl;
2690326914
}
2690426915
findPackageForDownload(version) {
2690526916
return __awaiter(this, void 0, void 0, function* () {
@@ -26944,6 +26955,14 @@ class AdoptDistribution extends base_installer_1.JavaBase {
2694426955
return { version: javaRelease.version, path: javaPath };
2694526956
});
2694626957
}
26958+
get toolcacheFolderName() {
26959+
if (this.jvmImpl === AdoptImplementation.Hotspot) {
26960+
// exclude Hotspot postfix from distribution name because Hosted runners have pre-cached Adopt OpenJDK under "Java_Adopt_jdk"
26961+
// for more information see: https://github.com/actions/setup-java/pull/155#discussion_r610451063
26962+
return `Java_Adopt_${this.packageType}`;
26963+
}
26964+
return super.toolcacheFolderName;
26965+
}
2694726966
getAvailableVersions() {
2694826967
return __awaiter(this, void 0, void 0, function* () {
2694926968
const platform = this.getPlatformOption();
@@ -26956,13 +26975,13 @@ class AdoptDistribution extends base_installer_1.JavaBase {
2695626975
`project=jdk`,
2695726976
'vendor=adoptopenjdk',
2695826977
`heap_size=normal`,
26959-
`jvm_impl=hotspot`,
2696026978
'sort_method=DEFAULT',
2696126979
'sort_order=DESC',
2696226980
`os=${platform}`,
2696326981
`architecture=${arch}`,
2696426982
`image_type=${imageType}`,
26965-
`release_type=${releaseType}`
26983+
`release_type=${releaseType}`,
26984+
`jvm_impl=${this.jvmImpl.toLowerCase()}`
2696626985
].join('&');
2696726986
// need to iterate through all pages to retrieve the list of all versions
2696826987
// Adopt API doesn't provide way to retrieve the count of pages to iterate so infinity loop

‎docs/advanced-usage.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ steps:
2222
- uses: actions/checkout@v2
2323
- uses: actions/setup-java@v2
2424
with:
25-
distribution: 'adopt'
25+
distribution: 'adopt-hotspot' # See 'Supported distributions' for available options @ README.md
2626
java-version: '11'
2727
- run: java -cp java HelloWorldApp
2828
```

‎src/distributions/adopt/installer.ts‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ import semver from 'semver';
77

88
import { JavaBase } from '../base-installer';
99
import { IAdoptAvailableVersions } from './models';
10-
import { JavaInstallerOptions, JavaDownloadRelease, JavaInstallerResults } from '../base-models';
11-
import { MACOS_JAVA_CONTENT_POSTFIX } from '../../constants';
10+
import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models';
1211
import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util';
1312

13+
export enum AdoptImplementation {
14+
Hotspot = 'Hotspot',
15+
OpenJ9 = 'OpenJ9'
16+
}
17+
1418
export class AdoptDistribution extends JavaBase {
15-
constructor(installerOptions: JavaInstallerOptions) {
16-
super('Adopt', installerOptions);
19+
constructor(
20+
installerOptions: JavaInstallerOptions,
21+
private readonly jvmImpl: AdoptImplementation
22+
) {
23+
super(`Adopt-${jvmImpl}`, installerOptions);
1724
}
1825

1926
protected async findPackageForDownload(version: string): Promise<JavaDownloadRelease> {
@@ -70,6 +77,15 @@ export class AdoptDistribution extends JavaBase {
7077
return { version: javaRelease.version, path: javaPath };
7178
}
7279

80+
protected get toolcacheFolderName(): string {
81+
if (this.jvmImpl === AdoptImplementation.Hotspot) {
82+
// exclude Hotspot postfix from distribution name because Hosted runners have pre-cached Adopt OpenJDK under "Java_Adopt_jdk"
83+
// for more information see: https://github.com/actions/setup-java/pull/155#discussion_r610451063
84+
return `Java_Adopt_${this.packageType}`;
85+
}
86+
return super.toolcacheFolderName;
87+
}
88+
7389
private async getAvailableVersions(): Promise<IAdoptAvailableVersions[]> {
7490
const platform = this.getPlatformOption();
7591
const arch = this.architecture;
@@ -83,13 +99,13 @@ export class AdoptDistribution extends JavaBase {
8399
`project=jdk`,
84100
'vendor=adoptopenjdk',
85101
`heap_size=normal`,
86-
`jvm_impl=hotspot`,
87102
'sort_method=DEFAULT',
88103
'sort_order=DESC',
89104
`os=${platform}`,
90105
`architecture=${arch}`,
91106
`image_type=${imageType}`,
92-
`release_type=${releaseType}`
107+
`release_type=${releaseType}`,
108+
`jvm_impl=${this.jvmImpl.toLowerCase()}`
93109
].join('&');
94110

95111
// need to iterate through all pages to retrieve the list of all versions

‎src/distributions/distribution-factory.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
import { AdoptDistribution } from './adopt/installer';
21
import { JavaBase } from './base-installer';
32
import { JavaInstallerOptions } from './base-models';
43
import { LocalDistribution } from './local/installer';
54
import { ZuluDistribution } from './zulu/installer';
5+
import { AdoptDistribution, AdoptImplementation } from './adopt/installer';
66

77
enum JavaDistribution {
88
Adopt = 'adopt',
9+
AdoptHotspot = 'adopt-hotspot',
10+
AdoptOpenJ9 = 'adopt-openj9',
911
Zulu = 'zulu',
1012
JdkFile = 'jdkfile'
1113
}
@@ -19,7 +21,10 @@ export function getJavaDistribution(
1921
case JavaDistribution.JdkFile:
2022
return new LocalDistribution(installerOptions, jdkFile);
2123
case JavaDistribution.Adopt:
22-
return new AdoptDistribution(installerOptions);
24+
case JavaDistribution.AdoptHotspot:
25+
return new AdoptDistribution(installerOptions, AdoptImplementation.Hotspot);
26+
case JavaDistribution.AdoptOpenJ9:
27+
return new AdoptDistribution(installerOptions, AdoptImplementation.OpenJ9);
2328
case JavaDistribution.Zulu:
2429
return new ZuluDistribution(installerOptions);
2530
default:

0 commit comments

Comments
 (0)