diff --git a/src/cppcheck/cppcheck.ts b/src/cppcheck/cppcheck.ts index c9a0d989..6c8bda48 100644 --- a/src/cppcheck/cppcheck.ts +++ b/src/cppcheck/cppcheck.ts @@ -1,12 +1,15 @@ +import { addPath } from "@actions/core" import { setupAptPack } from "../utils/setup/setupAptPack" import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupChocoPack } from "../utils/setup/setupChocoPack" // eslint-disable-next-line @typescript-eslint/no-unused-vars -export function setupCppcheck(version: string | undefined, _setupCppDir: string, _arch: string) { +export async function setupCppcheck(version: string | undefined, _setupCppDir: string, _arch: string) { switch (process.platform) { case "win32": { - return setupChocoPack("cppcheck", version) + await setupChocoPack("cppcheck", version) + addPath("C:\\Program Files\\Cppcheck") + break } case "darwin": { return setupBrewPack("cppcheck", version) diff --git a/src/doxygen/doxygen.ts b/src/doxygen/doxygen.ts index 8ec02862..f069f193 100644 --- a/src/doxygen/doxygen.ts +++ b/src/doxygen/doxygen.ts @@ -1,3 +1,4 @@ +import { addPath } from "@actions/core" import { setupAptPack } from "../utils/setup/setupAptPack" import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupChocoPack } from "../utils/setup/setupChocoPack" @@ -7,10 +8,13 @@ export async function setupDoxygen(version: string | undefined, _setupCppDir: st switch (process.platform) { case "win32": { await setupChocoPack("graphviz", version) - return setupChocoPack("doxygen.install", version) + await setupChocoPack("doxygen.install", version) + addPath("C:\\Program Files\\Graphviz\\bin") + addPath("C:\\Program Files\\doxygen\\bin") + break } case "darwin": { - await setupBrewPack("graphviz", version) + setupBrewPack("graphviz", version) return setupBrewPack("doxygen", version) } case "linux": { diff --git a/src/gcc/gcc.ts b/src/gcc/gcc.ts index afcf5f7d..fda53ae3 100644 --- a/src/gcc/gcc.ts +++ b/src/gcc/gcc.ts @@ -1,15 +1,22 @@ +import { addPath } from "@actions/core" import { setupAptPack } from "../utils/setup/setupAptPack" import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupChocoPack } from "../utils/setup/setupChocoPack" // eslint-disable-next-line @typescript-eslint/no-unused-vars -export function setupGcc(version: string, _setupCppDir: string, arch: string) { +export async function setupGcc(version: string, _setupCppDir: string, arch: string) { switch (process.platform) { case "win32": { if (arch === "arm" || arch === "arm64") { - return setupChocoPack("gcc-arm-embedded", version) + await setupChocoPack("gcc-arm-embedded", version) } - return setupChocoPack("mingw", version) + await setupChocoPack("mingw", version) + if (arch === "x64") { + addPath("C:\\tools\\mingw64\\bin") + } else if (arch === "ia32") { + addPath("C:\\tools\\mingw32\\bin") + } + break } case "darwin": { return setupBrewPack("gcc", version)