Add Go bin if go-version input is empty (#351)

actions · Mar 14, 2023 · fdc0d67 · fdc0d67
1 parent ebfdf6a
commit fdc0d67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -63605,13 +63605,13 @@ function run() {
                     core.info('Setting GOROOT for Go version < 1.9');
                     core.exportVariable('GOROOT', installDir);
                 }
-                const added = yield addBinToPath();
-                core.debug(`add bin ${added}`);
                 core.info(`Successfully set up Go version ${versionSpec}`);
             }
             else {
                 core.info('[warning]go-version input was not specified. The action will try to use pre-installed version.');
             }
+            const added = yield addBinToPath();
+            core.debug(`add bin ${added}`);
             const goPath = yield io.which('go');
             const goVersion = (child_process_1.default.execSync(`${goPath} version`) || '').toString();
             if (cache && cache_utils_1.isCacheFeatureAvailable()) {

diff --git a/src/main.ts b/src/main.ts
@@ -51,15 +51,16 @@ export async function run() {
         core.exportVariable('GOROOT', installDir);
       }
 
-      const added = await addBinToPath();
-      core.debug(`add bin ${added}`);
       core.info(`Successfully set up Go version ${versionSpec}`);
     } else {
       core.info(
         '[warning]go-version input was not specified. The action will try to use pre-installed version.'
       );
     }
 
+    const added = await addBinToPath();
+    core.debug(`add bin ${added}`);
+
     const goPath = await io.which('go');
     const goVersion = (cp.execSync(`${goPath} version`) || '').toString();