create profiles go dir if go installed but not exists

actions · Mar 26, 2020 · 4e8106c · 4e8106c
1 parent 93ddff5
commit 4e8106c
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -1331,7 +1331,7 @@ function addBinToPath() {
     return __awaiter(this, void 0, void 0, function* () {
         let added = false;
         let g = yield io.which('go');
-        core.debug(`which go :${g};`);
+        core.debug(`which go :${g}:`);
         if (!g) {
             core.debug('go not in the path');
             return added;
@@ -1340,18 +1340,18 @@ function addBinToPath() {
         if (buf) {
             let gp = buf.toString().trim();
             core.debug(`go env GOPATH :${gp}:`);
-            if (fs.existsSync(gp)) {
-                let bp = path.join(gp, 'bin');
-                if (!fs.existsSync(bp)) {
-                    core.debug(`creating ${bp}`);
-                    io.mkdirP(bp);
-                }
-                core.addPath(bp);
-                added = true;
+            if (!fs.existsSync(gp)) {
+                // some of the hosted images have go install but not profile dir
+                core.debug(`creating ${gp}`);
+                io.mkdirP(gp);
             }
-            else {
-                core.debug('go env GOPATH does not exist');
+            let bp = path.join(gp, 'bin');
+            if (!fs.existsSync(bp)) {
+                core.debug(`creating ${bp}`);
+                io.mkdirP(bp);
             }
+            core.addPath(bp);
+            added = true;
         }
         return added;
     });

diff --git a/src/main.ts b/src/main.ts
@@ -63,7 +63,7 @@ export async function run() {
 async function addBinToPath(): Promise<boolean> {
   let added = false;
   let g = await io.which('go');
-  core.debug(`which go :${g};`);
+  core.debug(`which go :${g}:`);
   if (!g) {
     core.debug('go not in the path');
     return added;
@@ -73,18 +73,20 @@ async function addBinToPath(): Promise<boolean> {
   if (buf) {
     let gp = buf.toString().trim();
     core.debug(`go env GOPATH :${gp}:`);
-    if (fs.existsSync(gp)) {
-      let bp = path.join(gp, 'bin');
-      if (!fs.existsSync(bp)) {
-        core.debug(`creating ${bp}`);
-        io.mkdirP(bp);
-      }
+    if (!fs.existsSync(gp)) {
+      // some of the hosted images have go install but not profile dir
+      core.debug(`creating ${gp}`);
+      io.mkdirP(gp);
+    }
 
-      core.addPath(bp);
-      added = true;
-    } else {
-      core.debug('go env GOPATH does not exist');
+    let bp = path.join(gp, 'bin');
+    if (!fs.existsSync(bp)) {
+      core.debug(`creating ${bp}`);
+      io.mkdirP(bp);
     }
+
+    core.addPath(bp);
+    added = true;
   }
   return added;
 }