mirror of
https://github.com/actions/setup-java
synced 2024-12-22 05:02:41 +00:00
Merge pull request #342 from gdams/msft
msft: bump jdk17 to 17.0.3 and add aarch64 support to jdk11
This commit is contained in:
commit
ddbbc2fff5
3 changed files with 18 additions and 7 deletions
|
@ -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',
|
||||
|
|
9
dist/setup/index.js
vendored
9
dist/setup/index.js
vendored
|
@ -101717,11 +101717,17 @@ 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]
|
||||
},
|
||||
{
|
||||
version: [17, 0, 1, 12, 1]
|
||||
},
|
||||
{
|
||||
version: [16, 0, 2, 7, 1]
|
||||
},
|
||||
{
|
||||
version: [11, 0, 15]
|
||||
}
|
||||
];
|
||||
// M1 is only supported for Java 16 & 17
|
||||
|
@ -101729,9 +101735,6 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
|
|||
jdkVersions.push({
|
||||
version: [11, 0, 13, 8, 1]
|
||||
});
|
||||
jdkVersions.push({
|
||||
version: [11, 0, 15]
|
||||
});
|
||||
}
|
||||
return jdkVersions;
|
||||
});
|
||||
|
|
|
@ -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 = [
|
||||
{
|
||||
version: [17, 0, 3]
|
||||
},
|
||||
{
|
||||
version: [17, 0, 1, 12, 1]
|
||||
},
|
||||
{
|
||||
version: [16, 0, 2, 7, 1]
|
||||
},
|
||||
{
|
||||
version: [11, 0, 15]
|
||||
}
|
||||
];
|
||||
|
||||
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue