actions/setup-java
2
0
Fork 0
mirror of https://github.com/actions/setup-java.git synced 2025-04-21 10:26:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix type

Browse source
This commit is contained in:
Dmitry Shibanov 2022-09-19 17:26:47 +02:00
parent 7f8371344e
commit 62a27417dc
3 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
__tests__/distributors/microsoft-installer.test.ts
View file

@ -19,7 +19,7 @@ describe('findPackageForDownload', () => {
spyGetManifestFromRepo = jest.spyOn(httpm.HttpClient.prototype, 'getJson'); spyGetManifestFromRepo = jest.spyOn(httpm.HttpClient.prototype, 'getJson');
spyGetManifestFromRepo.mockReturnValue({ spyGetManifestFromRepo.mockReturnValue({
result: JSON.stringify(data), result: data,
statusCode: 200, statusCode: 200,
headers: {} headers: {}
}); });

13
dist/setup/index.js vendored
View file

@ -104460,7 +104460,7 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
const repository = 'setup-java'; const repository = 'setup-java';
const branch = 'add-json-for-microsoft-versions'; const branch = 'add-json-for-microsoft-versions';
const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json'; const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json';
let releases = []; let releases = null;
const fileUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`; const fileUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
const headers = { const headers = {
authorization: token, authorization: token,
@ -104477,15 +104477,8 @@ class MicrosoftDistributions extends base_installer_1.JavaBase {
core.debug(`Http request for microsoft-openjdk-versions.json failed with status code: ${response === null || response === void 0 ? void 0 : response.statusCode}`); core.debug(`Http request for microsoft-openjdk-versions.json failed with status code: ${response === null || response === void 0 ? void 0 : response.statusCode}`);
return null; return null;
} }
let versionsRaw = response.result; if (response.result) {
if (versionsRaw) { releases = response.result;
versionsRaw = versionsRaw.replace(/^\uFEFF/, '');
try {
releases = JSON.parse(versionsRaw);
}
catch (_a) {
core.debug('Invalid json');
}
} }
return releases; return releases;
}); });

17
src/distributions/microsoft/installer.ts
View file

@ -77,7 +77,7 @@ export class MicrosoftDistributions extends JavaBase {
const branch = 'add-json-for-microsoft-versions'; const branch = 'add-json-for-microsoft-versions';
const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json'; const filePath = 'src/distributions/microsoft/microsoft-openjdk-versions.json';
let releases: tc.IToolRelease[] = []; let releases: tc.IToolRelease[] | null = null;
const fileUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`; const fileUrl = `https://api.github.com/repos/${owner}/${repository}/contents/${filePath}?ref=${branch}`;
const headers: OutgoingHttpHeaders = { const headers: OutgoingHttpHeaders = {
@ -85,10 +85,10 @@ export class MicrosoftDistributions extends JavaBase {
accept: 'application/vnd.github.VERSION.raw' accept: 'application/vnd.github.VERSION.raw'
}; };
let response: ITypedResponse<string> | null = null; let response: ITypedResponse<tc.IToolRelease[]> | null = null;
try { try {
response = await this.http.getJson<string>(fileUrl, headers); response = await this.http.getJson<tc.IToolRelease[]>(fileUrl, headers);
if (!response.result) { if (!response.result) {
return null; return null;
} }
@ -99,15 +99,8 @@ export class MicrosoftDistributions extends JavaBase {
return null; return null;
} }
let versionsRaw = response.result; if (response.result) {
releases = response.result;
if (versionsRaw) {
versionsRaw = versionsRaw.replace(/^\uFEFF/, '');
try {
releases = JSON.parse(versionsRaw);
} catch {
core.debug('Invalid json');
}
} }
return releases; return releases;