Skip to content

Commit

Permalink
add bin to path
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryan MacFarlane committed Mar 26, 2020
1 parent e0b6a4d commit 9c31f59
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ jobs:
- name: validate version
run: go version | grep "go1.12.9"

- name: show cache
- name: dump env
shell: bash
run: |
echo $PATH
echo go versions in tool cache:
echo $(ls $RUNNER_TOOL_CACHE/go)
17 changes: 17 additions & 0 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4576,11 +4576,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
};
Object.defineProperty(exports, "__esModule", { value: true });
const tc = __importStar(__webpack_require__(533));
const cm = __importStar(__webpack_require__(470));
const path = __importStar(__webpack_require__(622));
const semver = __importStar(__webpack_require__(280));
const httpm = __importStar(__webpack_require__(539));
const sys = __importStar(__webpack_require__(737));
const core_1 = __webpack_require__(470);
const cp = __importStar(__webpack_require__(129));
const fs = __importStar(__webpack_require__(747));
function downloadGo(versionSpec, stable) {
return __awaiter(this, void 0, void 0, function* () {
let toolPath;
Expand All @@ -4602,6 +4605,7 @@ function downloadGo(versionSpec, stable) {
// extracts with a root folder that matches the fileName downloaded
const toolRoot = path.join(extPath, 'go');
toolPath = yield tc.cacheDir(toolRoot, 'go', makeSemver(match.version));
addBinToPath();
}
}
catch (error) {
Expand All @@ -4611,6 +4615,19 @@ function downloadGo(versionSpec, stable) {
});
}
exports.downloadGo = downloadGo;
function addBinToPath() {
return __awaiter(this, void 0, void 0, function* () {
let buf = cp.execSync('go env GOPATH');
if (buf) {
let d = buf.toString().trim();
let bp = path.join(d, 'bin');
if (fs.existsSync(bp)) {
cm.addPath(bp);
}
}
});
}
exports.addBinToPath = addBinToPath;
function findMatch(versionSpec, stable) {
return __awaiter(this, void 0, void 0, function* () {
let archFilter = sys.getArch();
Expand Down
16 changes: 16 additions & 0 deletions src/installer.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import * as tc from '@actions/tool-cache';
import * as cm from '@actions/core';
import * as path from 'path';
import * as semver from 'semver';
import * as httpm from '@actions/http-client';
import * as sys from './system';
import {debug} from '@actions/core';
import * as cp from 'child_process';
import * as fs from 'fs';

export async function downloadGo(
versionSpec: string,
Expand Down Expand Up @@ -34,6 +37,8 @@ export async function downloadGo(
// extracts with a root folder that matches the fileName downloaded
const toolRoot = path.join(extPath, 'go');
toolPath = await tc.cacheDir(toolRoot, 'go', makeSemver(match.version));

addBinToPath();
}
} catch (error) {
throw new Error(`Failed to download version ${versionSpec}: ${error}`);
Expand All @@ -55,6 +60,17 @@ export interface IGoVersion {
files: IGoVersionFile[];
}

export async function addBinToPath() {
let buf = cp.execSync('go env GOPATH');
if (buf) {
let d = buf.toString().trim();
let bp = path.join(d, 'bin');
if (fs.existsSync(bp)) {
cm.addPath(bp);
}
}
}

export async function findMatch(
versionSpec: string,
stable: boolean
Expand Down

0 comments on commit 9c31f59

Please sign in to comment.