Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from Jun 10, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1155606
msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11
gdams Jun 9, 2022
4fba831
fix test
gdams Jun 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion __tests__/distributors/microsoft-installer.test.ts
View file
Open in desktop
Expand Up @@ -14,10 +14,15 @@ describe('findPackageForDownload', () => {

it.each([
[
'17.x',
'17.0.1',
'17.0.1',
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
],
[
'17.x',
'17.0.3',
'https://aka.ms/download-jdk/microsoft-jdk-17.0.3-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}'
],
[
'16.0.x',
'16.0.2',
Expand Down
9 changes: 6 additions & 3 deletions dist/setup/index.js
View file
Open in desktop
Expand Up @@ -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]
gdams marked this conversation as resolved.
Show resolved Hide resolved
},
{
version: [17, 0, 1, 12, 1]
},
{
version: [16, 0, 2, 7, 1]
},
{
version: [11, 0, 15]
gdams marked this conversation as resolved.
Show resolved Hide resolved
}
];
// 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({
gdams marked this conversation as resolved.
Show resolved Hide resolved
version: [11, 0, 15]
});
}
return jdkVersions;
});
Expand Down
9 changes: 6 additions & 3 deletions src/distributions/microsoft/installer.ts
View file
Open in desktop
Expand Up @@ -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 = [
{
gdams marked this conversation as resolved.
Show resolved Hide resolved
version: [17, 0, 3]
},
{
version: [17, 0, 1, 12, 1]
},
{
version: [16, 0, 2, 7, 1]
},
{
version: [11, 0, 15]
}
];

Expand All @@ -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;
Expand Down