This commit is contained in:
Dmitry Shibanov 2022-09-05 15:00:18 +02:00
parent afb8d2e48a
commit e2b8e57140
2 changed files with 5 additions and 2 deletions

3
dist/setup/index.js vendored
View file

@ -102435,7 +102435,7 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
if (!availableVersionsRaw) {
throw new Error('Could not load manifest for Microsoft Build of OpenJDK');
}
const foundRelease = yield tc.findFromManifest(range, true, availableVersionsRaw, this.architecture);
const foundRelease = yield tc.findFromManifest(range, true, availableVersionsRaw.map(item => Object.assign(item, { release_url: '' })), this.architecture);
// const opts = this.getPlatformOption();
// const availableVersions = availableVersionsRaw.map(item => ({
// url: `https://aka.ms/download-jdk/microsoft-jdk-${item.version.join('.')}-${opts.os}-${
@ -102469,6 +102469,7 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
// We will need Microsoft to add an endpoint where we can query for versions.
const token = core.getInput('token');
const manifest = (yield this.http.getJson('https://github.com/dmitry-shibanov/setup-java/blob/add-json-for-microsoft-versions/microsoft-build-of-openjdk-versions.json', { authorization: token })).result;
core.info(manifest);
return manifest;
});
}

View file

@ -105,12 +105,14 @@ export class MicrosoftDistributions extends JavaBase {
// We will need Microsoft to add an endpoint where we can query for versions.
const token = core.getInput('token');
const manifest = (
await this.http.getJson<IToolRelease[]>(
await this.http.getJson<any>(
'https://github.com/dmitry-shibanov/setup-java/blob/add-json-for-microsoft-versions/microsoft-build-of-openjdk-versions.json',
{ authorization: token }
)
).result;
core.info(manifest);
return manifest;
}