actions/setup-java
3
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #342 from gdams/msft

Browse Source 
msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11
This commit is contained in:
Marko Zivic 2022-06-10 09:41:48 +02:00 committed by GitHub
commit ddbbc2fff5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
__tests__/distributors/microsoft-installer.test.ts
View File

@ -14,10 +14,15 @@ describe('findPackageForDownload', () => {
it.each([ it.each([
[ [
'17.x', '17.0.1',
'17.0.1', '17.0.1',
'https://aka.ms/download-jdk/microsoft-jdk-17.0.1.12.1-{{OS_TYPE}}-x64.{{ARCHIVE_TYPE}}' '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.x',
'16.0.2', '16.0.2',

9
dist/setup/index.js vendored
View File

@ -101717,11 +101717,17 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
// TODO get these dynamically! // TODO get these dynamically!
// We will need Microsoft to add an endpoint where we can query for versions. // We will need Microsoft to add an endpoint where we can query for versions.
const jdkVersions = [ const jdkVersions = [
{
version: [17, 0, 3]
},
{ {
version: [17, 0, 1, 12, 1] version: [17, 0, 1, 12, 1]
}, },
{ {
version: [16, 0, 2, 7, 1] version: [16, 0, 2, 7, 1]
},
{
version: [11, 0, 15]
} }
]; ];
// M1 is only supported for Java 16 & 17 // M1 is only supported for Java 16 & 17
@ -101729,9 +101735,6 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
jdkVersions.push({ jdkVersions.push({
version: [11, 0, 13, 8, 1] version: [11, 0, 13, 8, 1]
}); });
jdkVersions.push({
version: [11, 0, 15]
});
} }
return jdkVersions; return jdkVersions;
}); });

9
src/distributions/microsoft/installer.ts
View File

@ -80,11 +80,17 @@ export class MicrosoftDistributions extends JavaBase {
// TODO get these dynamically! // TODO get these dynamically!
// We will need Microsoft to add an endpoint where we can query for versions. // We will need Microsoft to add an endpoint where we can query for versions.
const jdkVersions = [ const jdkVersions = [
{
version: [17, 0, 3]
},
{ {
version: [17, 0, 1, 12, 1] version: [17, 0, 1, 12, 1]
}, },
{ {
version: [16, 0, 2, 7, 1] version: [16, 0, 2, 7, 1]
},
{
version: [11, 0, 15]
} }
]; ];
@ -93,9 +99,6 @@ export class MicrosoftDistributions extends JavaBase {
jdkVersions.push({ jdkVersions.push({
version: [11, 0, 13, 8, 1] version: [11, 0, 13, 8, 1]
}); });
jdkVersions.push({
version: [11, 0, 15]
});
} }
return jdkVersions; return jdkVersions;