Skip to content

Commit

Permalink
Merge pull request #5 from Azure/users/ansheno/helminstallfix
Browse files Browse the repository at this point in the history
Added helm binary to the Path environment variable
  • Loading branch information
shashankbarsin committed Nov 26, 2019
2 parents 11c996f + fe2c706 commit 87a2cd5
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 3 deletions.
2 changes: 2 additions & 0 deletions README.md
Expand Up @@ -9,6 +9,8 @@ Acceptable values are latest or any semantic version string like 1.15.0. Use thi
version: '<version>' # default is latest stable
id: install
```

The cached helm binary path is prepended to the PATH environment variable as well as stored in the helm-path output variable.
Refer to the action metadata file for details about all the inputs https://github.com/Azure/setup-helm/blob/master/action.yml

# Contributing
Expand Down
12 changes: 10 additions & 2 deletions lib/run.js
Expand Up @@ -22,8 +22,8 @@ const os = __importStar(require("os"));
const path = __importStar(require("path"));
const util = __importStar(require("util"));
const fs = __importStar(require("fs"));
const toolCache = __importStar(require("../node_modules/@actions/tool-cache"));
const core = __importStar(require("../node_modules/@actions/core"));
const toolCache = __importStar(require("@actions/tool-cache"));
const core = __importStar(require("@actions/core"));
const helmToolName = 'helm';
const stableHelmVersion = 'v2.14.1';
const helmLatestReleaseUrl = 'https://api.github.com/repos/helm/helm/releases/latest';
Expand Down Expand Up @@ -119,6 +119,14 @@ function run() {
version = yield getStableHelmVersion();
}
let cachedPath = yield downloadHelm(version);
try {
if (!process.env['PATH'].startsWith(path.dirname(cachedPath))) {
core.addPath(path.dirname(cachedPath));
}
}
catch (_a) {
//do nothing, set as output variable
}
console.log(`Helm tool version: '${version}' has been cached at ${cachedPath}`);
core.setOutput('helm-path', cachedPath);
});
Expand Down
11 changes: 11 additions & 0 deletions src/run.ts
Expand Up @@ -114,6 +114,17 @@ async function run() {
}

let cachedPath = await downloadHelm(version);

try {

if (!process.env['PATH'].startsWith(path.dirname(cachedPath))) {
core.addPath(path.dirname(cachedPath));
}
}
catch {
//do nothing, set as output variable
}

console.log(`Helm tool version: '${version}' has been cached at ${cachedPath}`);
core.setOutput('helm-path', cachedPath);
}
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Expand Up @@ -22,7 +22,7 @@
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */

/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
//"strict": true, /* Enable all strict type-checking options. */
"noImplicitAny": false, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
Expand Down

0 comments on commit 87a2cd5

Please sign in to comment.