Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
better user output
  • Loading branch information
Bryan MacFarlane committed Feb 10, 2020
1 parent 6b10398 commit a6a701e
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 0 deletions.
6 changes: 6 additions & 0 deletions dist/index.js
Expand Up @@ -1290,14 +1290,18 @@ function run() {
// stable will be true unless false is the exact input
// since getting unstable versions should be explicit
let stable = Boolean(core.getInput('stable') || 'true');
console.log(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
if (versionSpec) {
let installDir = tc.find('go', versionSpec);
if (!installDir) {
console.log(`A version satisfying ${versionSpec} not found locally, attempting to download ...`);
installDir = yield installer.downloadGo(versionSpec, stable);
console.log('installed');
}
if (installDir) {
core.exportVariable('GOROOT', installDir);
core.addPath(path.join(installDir, 'bin'));
console.log('added to the path');
}
else {
throw new Error(`Could not find a version that satisfied version spec: ${versionSpec}`);
Expand Down Expand Up @@ -4586,9 +4590,11 @@ function downloadGo(versionSpec, stable) {
// download
core_1.debug(`match ${match.version}`);
let downloadUrl = `https://storage.googleapis.com/golang/${match.files[0].filename}`;
console.log(`Downloading from ${downloadUrl}`);
let downloadPath = yield tc.downloadTool(downloadUrl);
core_1.debug(`downloaded to ${downloadPath}`);
// extract
console.log('Extracting ...');
let extPath = sys.getPlatform() == 'windows'
? yield tc.extractZip(downloadPath)
: yield tc.extractTar(downloadPath);
Expand Down
3 changes: 3 additions & 0 deletions src/installer.ts
Expand Up @@ -18,10 +18,13 @@ export async function downloadGo(
// download
debug(`match ${match.version}`);
let downloadUrl: string = `https://storage.googleapis.com/golang/${match.files[0].filename}`;
console.log(`Downloading from ${downloadUrl}`);

let downloadPath: string = await tc.downloadTool(downloadUrl);
debug(`downloaded to ${downloadPath}`);

// extract
console.log('Extracting ...');
let extPath: string =
sys.getPlatform() == 'windows'
? await tc.extractZip(downloadPath)
Expand Down
9 changes: 9 additions & 0 deletions src/main.ts
Expand Up @@ -15,16 +15,25 @@ export async function run() {
// since getting unstable versions should be explicit
let stable = Boolean(core.getInput('stable') || 'true');

console.log(
`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`
);

if (versionSpec) {
let installDir: string | undefined = tc.find('go', versionSpec);

if (!installDir) {
console.log(
`A version satisfying ${versionSpec} not found locally, attempting to download ...`
);
installDir = await installer.downloadGo(versionSpec, stable);
console.log('installed');
}

if (installDir) {
core.exportVariable('GOROOT', installDir);
core.addPath(path.join(installDir, 'bin'));
console.log('added to the path');
} else {
throw new Error(
`Could not find a version that satisfied version spec: ${versionSpec}`
Expand Down

0 comments on commit a6a701e

Please sign in to comment.