diff --git a/src/distributions/microsoft/installer.ts b/src/distributions/microsoft/installer.ts index 9daf2415..5a2ded49 100644 --- a/src/distributions/microsoft/installer.ts +++ b/src/distributions/microsoft/installer.ts @@ -1,13 +1,18 @@ import { JavaBase } from '../base-installer'; import { JavaDownloadRelease, JavaInstallerOptions, JavaInstallerResults } from '../base-models'; -import semver from 'semver'; -import { extractJdkFile, getDownloadArchiveExtension, isVersionSatisfies } from '../../util'; +import { extractJdkFile, getDownloadArchiveExtension } from '../../util'; import * as core from '@actions/core'; import { MicrosoftVersion, PlatformOptions } from './models'; import * as tc from '@actions/tool-cache'; import fs from 'fs'; import path from 'path'; +export interface IToolRelease { + version: string; + stable: boolean; + files: tc.IToolReleaseFile[]; +} + export class MicrosoftDistributions extends JavaBase { constructor(installerOptions: JavaInstallerOptions) { super('Microsoft', installerOptions); @@ -58,7 +63,7 @@ export class MicrosoftDistributions extends JavaBase { const foundRelease = await tc.findFromManifest( range, true, - availableVersionsRaw, + availableVersionsRaw.map(item => Object.assign(item, { release_url: '' })), this.architecture ); @@ -95,12 +100,12 @@ export class MicrosoftDistributions extends JavaBase { return { url: foundRelease.release_url, version: foundRelease.version }; } - private async getAvailableVersions(): Promise { + private async getAvailableVersions(): Promise { // TODO get these dynamically! // 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( + await this.http.getJson( 'https://github.com/dmitry-shibanov/setup-java/blob/add-json-for-microsoft-versions/microsoft-build-of-openjdk-versions.json', { authorization: token } )