Skip to content

Commit 882d0f7

Browse files
committed
feat: catch the addPath failure
1 parent 87beee7 commit 882d0f7

File tree

8 files changed

+25
-7
lines changed

8 files changed

+25
-7
lines changed

src/cppcheck/cppcheck.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "@actions/core"
1+
import { addPath } from "../utils/path/addPath"
22
import { setupAptPack } from "../utils/setup/setupAptPack"
33
import { setupBrewPack } from "../utils/setup/setupBrewPack"
44
import { setupChocoPack } from "../utils/setup/setupChocoPack"

src/doxygen/doxygen.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "@actions/core"
1+
import { addPath } from "../utils/path/addPath"
22
import { setupAptPack } from "../utils/setup/setupAptPack"
33
import { setupBrewPack } from "../utils/setup/setupBrewPack"
44
import { setupChocoPack } from "../utils/setup/setupChocoPack"

src/gcc/gcc.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { addPath, exportVariable, info } from "@actions/core"
1+
import { exportVariable, info } from "@actions/core"
2+
import { addPath } from "../utils/path/addPath"
23
import { existsSync } from "fs"
34
import { setupAptPack } from "../utils/setup/setupAptPack"
45
import { setupBrewPack } from "../utils/setup/setupBrewPack"

src/opencppcoverage/opencppcoverage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { addPath } from "@actions/core"
1+
import { addPath } from "../utils/path/addPath"
22
import { setupChocoPack } from "../utils/setup/setupChocoPack"
33

44
// eslint-disable-next-line @typescript-eslint/no-unused-vars

src/utils/path/addPath.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { addPath as ghAddPath } from "@actions/core"
2+
import { delimiter } from "path"
3+
import * as core from "@actions/core"
4+
5+
/** An add path function that works locally or inside GitHub Actions */
6+
export function addPath(path: string) {
7+
try {
8+
ghAddPath(path)
9+
} catch (err) {
10+
core.error(err as Error)
11+
core.error(`Failed to add ${path} to the percistent PATH. You should add it manually.`)
12+
process.env.PATH = `${path}${delimiter}${process.env.PATH}`
13+
// TODO shell out to add path
14+
}
15+
}

src/utils/setup/setupBin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { find, downloadTool, cacheDir } from "@actions/tool-cache"
2-
import { addPath, info } from "@actions/core"
2+
import { info } from "@actions/core"
3+
import { addPath } from "../path/addPath"
34
import { join } from "path"
45
import { existsSync } from "fs"
56
import * as hasha from "hasha"

src/utils/setup/setupChocoPack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* eslint-disable require-atomic-updates */
2-
import { addPath } from "@actions/core"
2+
import { addPath } from "../path/addPath"
33
import which from "which"
44
import { setupChocolatey } from "../../chocolatey/chocolatey"
55
import { InstallationInfo } from "./setupBin"

src/utils/setup/setupPipPack.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import { getExecOutput } from "@actions/exec"
33
import spawn from "cross-spawn"
44
import which from "which"
5-
import { addPath, info } from "@actions/core"
5+
import { info } from "@actions/core"
6+
import { addPath } from "../path/addPath"
67
import { setupPython } from "../../python/python"
78
import { isBinUptoDate } from "./version"
89
import { join } from "path"

0 commit comments

Comments
 (0)