3
0
Fork 0
mirror of https://gitea.com/actions/setup-go.git synced 2024-11-22 09:39:31 +01:00

create profiles go dir if go installed but not exists

This commit is contained in:
Bryan MacFarlane 2020-03-26 13:00:45 -04:00
parent 93ddff5bef
commit 4e8106ca18
2 changed files with 25 additions and 23 deletions

22
dist/index.js vendored
View file

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

View file

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