better user output

This commit is contained in:
Bryan MacFarlane 2020-02-09 22:39:44 -05:00
parent 6b10398c43
commit a6a701e18e
3 changed files with 18 additions and 0 deletions

6
dist/index.js vendored
View file

@ -1290,14 +1290,18 @@ function run() {
// stable will be true unless false is the exact input // stable will be true unless false is the exact input
// since getting unstable versions should be explicit // since getting unstable versions should be explicit
let stable = Boolean(core.getInput('stable') || 'true'); let stable = Boolean(core.getInput('stable') || 'true');
console.log(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
if (versionSpec) { if (versionSpec) {
let installDir = tc.find('go', versionSpec); let installDir = tc.find('go', versionSpec);
if (!installDir) { if (!installDir) {
console.log(`A version satisfying ${versionSpec} not found locally, attempting to download ...`);
installDir = yield installer.downloadGo(versionSpec, stable); installDir = yield installer.downloadGo(versionSpec, stable);
console.log('installed');
} }
if (installDir) { if (installDir) {
core.exportVariable('GOROOT', installDir); core.exportVariable('GOROOT', installDir);
core.addPath(path.join(installDir, 'bin')); core.addPath(path.join(installDir, 'bin'));
console.log('added to the path');
} }
else { else {
throw new Error(`Could not find a version that satisfied version spec: ${versionSpec}`); throw new Error(`Could not find a version that satisfied version spec: ${versionSpec}`);
@ -4586,9 +4590,11 @@ function downloadGo(versionSpec, stable) {
// download // download
core_1.debug(`match ${match.version}`); core_1.debug(`match ${match.version}`);
let downloadUrl = `https://storage.googleapis.com/golang/${match.files[0].filename}`; let downloadUrl = `https://storage.googleapis.com/golang/${match.files[0].filename}`;
console.log(`Downloading from ${downloadUrl}`);
let downloadPath = yield tc.downloadTool(downloadUrl); let downloadPath = yield tc.downloadTool(downloadUrl);
core_1.debug(`downloaded to ${downloadPath}`); core_1.debug(`downloaded to ${downloadPath}`);
// extract // extract
console.log('Extracting ...');
let extPath = sys.getPlatform() == 'windows' let extPath = sys.getPlatform() == 'windows'
? yield tc.extractZip(downloadPath) ? yield tc.extractZip(downloadPath)
: yield tc.extractTar(downloadPath); : yield tc.extractTar(downloadPath);

View file

@ -18,10 +18,13 @@ export async function downloadGo(
// download // download
debug(`match ${match.version}`); debug(`match ${match.version}`);
let downloadUrl: string = `https://storage.googleapis.com/golang/${match.files[0].filename}`; let downloadUrl: string = `https://storage.googleapis.com/golang/${match.files[0].filename}`;
console.log(`Downloading from ${downloadUrl}`);
let downloadPath: string = await tc.downloadTool(downloadUrl); let downloadPath: string = await tc.downloadTool(downloadUrl);
debug(`downloaded to ${downloadPath}`); debug(`downloaded to ${downloadPath}`);
// extract // extract
console.log('Extracting ...');
let extPath: string = let extPath: string =
sys.getPlatform() == 'windows' sys.getPlatform() == 'windows'
? await tc.extractZip(downloadPath) ? await tc.extractZip(downloadPath)

View file

@ -15,16 +15,25 @@ export async function run() {
// since getting unstable versions should be explicit // since getting unstable versions should be explicit
let stable = Boolean(core.getInput('stable') || 'true'); let stable = Boolean(core.getInput('stable') || 'true');
console.log(
`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`
);
if (versionSpec) { if (versionSpec) {
let installDir: string | undefined = tc.find('go', versionSpec); let installDir: string | undefined = tc.find('go', versionSpec);
if (!installDir) { if (!installDir) {
console.log(
`A version satisfying ${versionSpec} not found locally, attempting to download ...`
);
installDir = await installer.downloadGo(versionSpec, stable); installDir = await installer.downloadGo(versionSpec, stable);
console.log('installed');
} }
if (installDir) { if (installDir) {
core.exportVariable('GOROOT', installDir); core.exportVariable('GOROOT', installDir);
core.addPath(path.join(installDir, 'bin')); core.addPath(path.join(installDir, 'bin'));
console.log('added to the path');
} else { } else {
throw new Error( throw new Error(
`Could not find a version that satisfied version spec: ${versionSpec}` `Could not find a version that satisfied version spec: ${versionSpec}`