timerzz/setup-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

only needed to do once

Browse Source
This commit is contained in:
Bryan MacFarlane 2020-03-26 13:46:15 -04:00
parent 4e8106ca18
commit 262468e92f
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/index.js vendored
View File

@ -1294,8 +1294,6 @@ function run() {
// since getting unstable versions should be explicit // since getting unstable versions should be explicit
let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE'; let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
console.log(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`); console.log(`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`);
// if there's a globally install go and bin path, prefer that
let addedBin = addBinToPath();
if (versionSpec) { if (versionSpec) {
let installDir = tc.find('go', versionSpec); let installDir = tc.find('go', versionSpec);
if (!installDir) { if (!installDir) {
@ -1307,11 +1305,8 @@ function run() {
core.exportVariable('GOROOT', installDir); core.exportVariable('GOROOT', installDir);
core.addPath(path.join(installDir, 'bin')); core.addPath(path.join(installDir, 'bin'));
console.log('Added go to the path'); console.log('Added go to the path');
// if the global installed bin wasn't added, let added = addBinToPath();
// we can add the bin just installed core.debug(`add bin ${added}`);
if (!addedBin) {
addBinToPath();
}
} }
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}`);

9
src/main.ts
View File

@ -22,8 +22,6 @@ export async function run() {
`Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}` `Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`
); );
// if there's a globally install go and bin path, prefer that
let addedBin = addBinToPath();
if (versionSpec) { if (versionSpec) {
let installDir: string | undefined = tc.find('go', versionSpec); let installDir: string | undefined = tc.find('go', versionSpec);
@ -40,11 +38,8 @@ export async function run() {
core.addPath(path.join(installDir, 'bin')); core.addPath(path.join(installDir, 'bin'));
console.log('Added go to the path'); console.log('Added go to the path');
// if the global installed bin wasn't added, let added = addBinToPath();
// we can add the bin just installed core.debug(`add bin ${added}`);
if (!addedBin) {
addBinToPath();
}
} 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}`