only needed to do once

actions · Mar 26, 2020 · 262468e · 262468e
1 parent 4e8106c
commit 262468e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1294,8 +1294,6 @@ function run() {
             // since getting unstable versions should be explicit
             let stable = (core.getInput('stable') || 'true').toUpperCase() === 'TRUE';
             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) {
                 let installDir = tc.find('go', versionSpec);
                 if (!installDir) {
@@ -1307,11 +1305,8 @@ function run() {
                     core.exportVariable('GOROOT', installDir);
                     core.addPath(path.join(installDir, 'bin'));
                     console.log('Added go to the path');
-                    // if the global installed bin wasn't added,
-                    // we can add the bin just installed
-                    if (!addedBin) {
-                        addBinToPath();
-                    }
+                    let added = addBinToPath();
+                    core.debug(`add bin ${added}`);
                 }
                 else {
                     throw new Error(`Could not find a version that satisfied version spec: ${versionSpec}`);

diff --git a/src/main.ts b/src/main.ts
@@ -22,8 +22,6 @@ export async function run() {
       `Setup go ${stable ? 'stable' : ''} version spec ${versionSpec}`
     );
 
-    // if there's a globally install go and bin path, prefer that
-    let addedBin = addBinToPath();
     if (versionSpec) {
       let installDir: string | undefined = tc.find('go', versionSpec);
 
@@ -40,11 +38,8 @@ export async function run() {
         core.addPath(path.join(installDir, 'bin'));
         console.log('Added go to the path');
 
-        // if the global installed bin wasn't added,
-        // we can add the bin just installed
-        if (!addedBin) {
-          addBinToPath();
-        }
+        let added = addBinToPath();
+        core.debug(`add bin ${added}`);
       } else {
         throw new Error(
           `Could not find a version that satisfied version spec: ${versionSpec}`