1 Commits

Author SHA1 Message Date
0073e65191 update 4.1.2 2023-10-23 02:12:28 +08:00
3 changed files with 9 additions and 15 deletions

View File

@@ -142,7 +142,7 @@ describe('setup-go', () => {
os.platform = 'darwin'; os.platform = 'darwin';
os.arch = 'x64'; os.arch = 'x64';
const match = await im.getInfoFromManifest('1.21', true, 'mocktoken'); const match = await im.getInfoFromManifest('1.9.7', true, 'mocktoken');
expect(match).toBeDefined(); expect(match).toBeDefined();
expect(match!.resolvedVersion).toBe('1.9.7'); expect(match!.resolvedVersion).toBe('1.9.7');
expect(match!.type).toBe('manifest'); expect(match!.type).toBe('manifest');

10
dist/setup/index.js vendored
View File

@@ -61594,14 +61594,12 @@ function getManifestFromRepo(owner, repo, auth, branch = 'master') {
} }
} }
headers['accept'] = 'application/vnd.github.VERSION.raw'; headers['accept'] = 'application/vnd.github.VERSION.raw';
const versionsRaw = yield (yield http.get(manifestUrl, headers)).readBody(); let versionsRaw = yield (yield http.get(manifestUrl, headers)).readBody();
const base64 = JSON.parse(versionsRaw); if (versionsRaw) {
let tmp = Buffer.from(base64['content'], 'base64').toString('ascii');
if (tmp) {
// shouldn't be needed but protects against invalid json saved with BOM // shouldn't be needed but protects against invalid json saved with BOM
tmp = tmp.replace(/^\uFEFF/, ''); versionsRaw = versionsRaw.replace(/^\uFEFF/, '');
try { try {
releases = JSON.parse(tmp); releases = JSON.parse(versionsRaw);
} }
catch (_a) { catch (_a) {
core.debug('Invalid json'); core.debug('Invalid json');

View File

@@ -321,17 +321,13 @@ export async function getManifestFromRepo(
} }
headers['accept'] = 'application/vnd.github.VERSION.raw'; headers['accept'] = 'application/vnd.github.VERSION.raw';
const versionsRaw = await (await http.get(manifestUrl, headers)).readBody(); let versionsRaw = await (await http.get(manifestUrl, headers)).readBody();
const base64 = JSON.parse(versionsRaw); if (versionsRaw) {
let tmp = Buffer.from(base64['content'], 'base64').toString('ascii');
if (tmp) {
// shouldn't be needed but protects against invalid json saved with BOM // shouldn't be needed but protects against invalid json saved with BOM
tmp = tmp.replace(/^\uFEFF/, ''); versionsRaw = versionsRaw.replace(/^\uFEFF/, '');
try { try {
releases = JSON.parse(tmp); releases = JSON.parse(versionsRaw);
} catch { } catch {
core.debug('Invalid json'); core.debug('Invalid json');
} }