actions
/
setup-cpp
Template
mirror of https://github.com/aminya/setup-cpp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: await addPath

This commit is contained in:
Amin Yahyaabadi 2021-09-18 07:30:16 -05:00
parent a4f327ad7e
commit 0dca6ef345
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/setup_cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/setup_cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
src/cppcheck/cppcheck.ts
View File

@ -9,7 +9,7 @@ export async function setupCppcheck(version: string | undefined, _setupCppDir: s
case "win32": { case "win32": {
await setupChocoPack("cppcheck", version) await setupChocoPack("cppcheck", version)
const binDir = "C:/Program Files/Cppcheck" const binDir = "C:/Program Files/Cppcheck"
addPath(binDir) await addPath(binDir)
return { binDir } return { binDir }
} }
case "darwin": { case "darwin": {

4
src/doxygen/doxygen.ts
View File

@ -9,9 +9,9 @@ export async function setupDoxygen(version: string | undefined, _setupCppDir: st
case "win32": { case "win32": {
await setupChocoPack("doxygen.install", version) await setupChocoPack("doxygen.install", version)
await setupChocoPack("graphviz", version) await setupChocoPack("graphviz", version)
addPath("C:/Program Files/Graphviz/bin") await addPath("C:/Program Files/Graphviz/bin")
const binDir = "C:/Program Files/doxygen/bin" const binDir = "C:/Program Files/doxygen/bin"
addPath(binDir) await addPath(binDir)
return { binDir } return { binDir }
} }
case "darwin": { case "darwin": {

4
src/gcc/gcc.ts
View File

@ -18,10 +18,10 @@ export async function setupGcc(version: string, _setupCppDir: string, arch: stri
await setupChocoPack("mingw", version) await setupChocoPack("mingw", version)
if (arch === "x64" && existsSync("C:/tools/mingw64/bin")) { if (arch === "x64" && existsSync("C:/tools/mingw64/bin")) {
binDir = "C:/tools/mingw64/bin" binDir = "C:/tools/mingw64/bin"
addPath(binDir) await addPath(binDir)
} else if (arch === "ia32" && existsSync("C:/tools/mingw32/bin")) { } else if (arch === "ia32" && existsSync("C:/tools/mingw32/bin")) {
binDir = "C:/tools/mingw32/bin" binDir = "C:/tools/mingw32/bin"
addPath(binDir) await addPath(binDir)
} else if (existsSync("C:/ProgramData/Chocolatey/bin/g++.exe")) { } else if (existsSync("C:/ProgramData/Chocolatey/bin/g++.exe")) {
binDir = "C:/ProgramData/Chocolatey/bin/" binDir = "C:/ProgramData/Chocolatey/bin/"
} }

2
src/opencppcoverage/opencppcoverage.ts
View File

@ -8,6 +8,6 @@ export async function setupOpencppcoverage(version: string | undefined, _setupCp
} }
await setupChocoPack("opencppcoverage", version) await setupChocoPack("opencppcoverage", version)
const binDir = "C:/Program Files/OpenCppCoverage" const binDir = "C:/Program Files/OpenCppCoverage"
addPath(binDir) await addPath(binDir)
return { binDir } return { binDir }
} }

4
src/utils/setup/setupBin.ts
View File

@ -53,7 +53,7 @@ export async function setupBin(
info(`${name} ${version} was found in the cache.`) info(`${name} ${version} was found in the cache.`)
const installDir = join(dir, extractedFolderName) const installDir = join(dir, extractedFolderName)
const binDir = join(installDir, binRelativeDir) const binDir = join(installDir, binRelativeDir)
addPath(binDir) await addPath(binDir)
return { installDir, binDir } return { installDir, binDir }
} }
} catch { } catch {
@ -77,7 +77,7 @@ export async function setupBin(
// Adding the bin dir to the path // Adding the bin dir to the path
/** The directory which the tool is installed to */ /** The directory which the tool is installed to */
info(`Add ${binDir} to PATH`) info(`Add ${binDir} to PATH`)
addPath(binDir) await addPath(binDir)
// check if inside Github Actions. If so, cache the installation // check if inside Github Actions. If so, cache the installation
if (typeof process.env.RUNNER_TOOL_CACHE === "string") { if (typeof process.env.RUNNER_TOOL_CACHE === "string") {

2
src/utils/setup/setupChocoPack.ts
View File

@ -26,6 +26,6 @@ export async function setupChocoPack(name: string, version?: string, args: strin
} }
const binDir = "C:/ProgramData/Chocolatey/bin/" const binDir = "C:/ProgramData/Chocolatey/bin/"
addPath(binDir) await addPath(binDir)
return { binDir } return { binDir }
} }

2
src/utils/setup/setupPipPack.ts
View File

@ -52,7 +52,7 @@ export async function setupPipPack(name: string, version?: string) {
} }
} }
info(`${binDir} to PATH`) info(`${binDir} to PATH`)
addPath(binDir) await addPath(binDir)
} }
return { binDir } return { binDir }