Skip to content

Commit ddbbc2f

Browse files
Merge pull request actions#342 from gdams/msft
msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11
2 parents ec303d3 + 4fba831 commit ddbbc2f

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

__tests__/distributors/microsoft-installer.test.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@ describe('findPackageForDownload', () => {
1414

1515
it.each([
1616
[
17-
'17.x',
17+
'17.0.1',
1818
'17.0.1',
1919
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
2020
],
21+
[
22+
'17.x',
23+
'17.0.3',
24+
'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
25+
],
2126
[
2227
'16.0.x',
2328
'16.0.2',

dist/setup/index.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101717,21 +101717,24 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
101717101717
// TODO get these dynamically!
101718101718
// We will need Microsoft to add an endpoint where we can query for versions.
101719101719
const jdkVersions = [
101720+
{
101721+
version: [17, 0, 3]
101722+
},
101720101723
{
101721101724
version: [17, 0, 1, 12, 1]
101722101725
},
101723101726
{
101724101727
version: [16, 0, 2, 7, 1]
101728+
},
101729+
{
101730+
version: [11, 0, 15]
101725101731
}
101726101732
];
101727101733
// M1 is only supported for Java 16 & 17
101728101734
if (process.platform !== 'darwin' || this.architecture !== 'aarch64') {
101729101735
jdkVersions.push({
101730101736
version: [11, 0, 13, 8, 1]
101731101737
});
101732-
jdkVersions.push({
101733-
version: [11, 0, 15]
101734-
});
101735101738
}
101736101739
return jdkVersions;
101737101740
});

src/distributions/microsoft/installer.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,17 @@ export class MicrosoftDistributions extends JavaBase {
8080
// TODO get these dynamically!
8181
// We will need Microsoft to add an endpoint where we can query for versions.
8282
const jdkVersions = [
83+
{
84+
version: [17, 0, 3]
85+
},
8386
{
8487
version: [17, 0, 1, 12, 1]
8588
},
8689
{
8790
version: [16, 0, 2, 7, 1]
91+
},
92+
{
93+
version: [11, 0, 15]
8894
}
8995
];
9096

@@ -93,9 +99,6 @@ export class MicrosoftDistributions extends JavaBase {
9399
jdkVersions.push({
94100
version: [11, 0, 13, 8, 1]
95101
});
96-
jdkVersions.push({
97-
version: [11, 0, 15]
98-
});
99102
}
100103

101104
return jdkVersions;

0 commit comments

Comments
 (0)