actions/setup-go
1
0
Fork 0
mirror of https://github.com/actions/setup-go.git synced 2025-04-23 17:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cannot reuse IGoVersionInfo from dist for manifest

Browse source 
...and vice versa.

While here, also free versionInfo and versionSpec so we don't
(un)intentionally overwrite them somewhere down below.
This commit is contained in:
Berk D. Demir 2020-09-15 21:55:44 -07:00
parent b9260615df
commit 47f75dda82
2 changed files with 49 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
dist/index.js vendored
View file

@ -5038,6 +5038,9 @@ function getGo(versionSpec, versionSpecResolver, stable, auth) {
} }
if (versionInfo && versionInfo.resolvedVersion.length > 0) { if (versionInfo && versionInfo.resolvedVersion.length > 0) {
versionSpec = versionInfo.resolvedVersion; versionSpec = versionInfo.resolvedVersion;
// Freeze these to protect (un)intentional overwrites.
Object.freeze(versionInfo);
Object.freeze(versionSpec);
} }
// check cache // check cache
let toolPath; let toolPath;
@ -5054,7 +5057,18 @@ function getGo(versionSpec, versionSpecResolver, stable, auth) {
// Try download from internal distribution (popular versions only) // Try download from internal distribution (popular versions only)
// //
try { try {
info = versionInfo !== null && versionInfo !== void 0 ? versionInfo : (yield getInfoFromManifest(versionSpec, stable, auth)); if ((versionInfo === null || versionInfo === void 0 ? void 0 : versionInfo.type) == 'manifest') {
info = versionInfo;
}
else {
// The version search in the cache was a miss. We either have no previous
// explicit version resolution attempt or it came from 'dist' version registry
// and have an `downloadUrl` pointing to an external resource.
//
// Check the @actions/go-versions manifest with current `versionSpec`; either
// an explicit one or a semver range.
info = yield getInfoFromManifest(versionSpec, stable, auth);
}
if (info) { if (info) {
downloadPath = yield installGoVersion(info, auth); downloadPath = yield installGoVersion(info, auth);
} }
@ -5077,7 +5091,15 @@ function getGo(versionSpec, versionSpecResolver, stable, auth) {
// Download from storage.googleapis.com // Download from storage.googleapis.com
// //
if (!downloadPath) { if (!downloadPath) {
info = versionInfo !== null && versionInfo !== void 0 ? versionInfo : (yield getInfoFromDist(versionSpec, stable)); if ((versionInfo === null || versionInfo === void 0 ? void 0 : versionInfo.type) == 'dist') {
info = versionInfo;
}
else {
// Version search didn't match anything available in the cache or @actions/go-versions.
// We either have no previous explicit version resolution attempt or downloading from
// @actions/go-versions manifest specified URL somehow failed.
info = yield getInfoFromDist(versionSpec, stable);
}
if (!info) { if (!info) {
let osPlat = os_1.default.platform(); let osPlat = os_1.default.platform();
let osArch = os_1.default.arch(); let osArch = os_1.default.arch();

28
src/installer.ts
View file

@ -53,6 +53,10 @@ export async function getGo(
if (versionInfo && versionInfo.resolvedVersion.length > 0) { if (versionInfo && versionInfo.resolvedVersion.length > 0) {
versionSpec = versionInfo.resolvedVersion; versionSpec = versionInfo.resolvedVersion;
// Freeze these to protect (un)intentional overwrites.
Object.freeze(versionInfo);
Object.freeze(versionSpec);
} }
// check cache // check cache
@ -71,8 +75,18 @@ export async function getGo(
// Try download from internal distribution (popular versions only) // Try download from internal distribution (popular versions only)
// //
try { try {
info = if (versionInfo?.type == 'manifest') {
versionInfo ?? (await getInfoFromManifest(versionSpec, stable, auth)); info = versionInfo;
} else {
// The version search in the cache was a miss. We either have no previous
// explicit version resolution attempt or it came from 'dist' version registry
// and have an `downloadUrl` pointing to an external resource.
//
// Check the @actions/go-versions manifest with current `versionSpec`; either
// an explicit one or a semver range.
info = await getInfoFromManifest(versionSpec, stable, auth);
}
if (info) { if (info) {
downloadPath = await installGoVersion(info, auth); downloadPath = await installGoVersion(info, auth);
} else { } else {
@ -99,7 +113,15 @@ export async function getGo(
// Download from storage.googleapis.com // Download from storage.googleapis.com
// //
if (!downloadPath) { if (!downloadPath) {
info = versionInfo ?? (await getInfoFromDist(versionSpec, stable)); if (versionInfo?.type == 'dist') {
info = versionInfo;
} else {
// Version search didn't match anything available in the cache or @actions/go-versions.
// We either have no previous explicit version resolution attempt or downloading from
// @actions/go-versions manifest specified URL somehow failed.
info = await getInfoFromDist(versionSpec, stable);
}
if (!info) { if (!info) {
let osPlat: string = os.platform(); let osPlat: string = os.platform();
let osArch: string = os.arch(); let osArch: string = os.arch();