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

fix: check if mingw paths exists

This commit is contained in:
Amin Yahyaabadi 2021-09-16 15:13:55 -05:00
parent 28f7f1fb27
commit a9e63280c3
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/gcc/gcc.ts
View File

@ -1,4 +1,5 @@
import { addPath } from "@actions/core" import { addPath } from "@actions/core"
import { existsSync } from "fs"
import { setupAptPack } from "../utils/setup/setupAptPack" import { setupAptPack } from "../utils/setup/setupAptPack"
import { setupBrewPack } from "../utils/setup/setupBrewPack" import { setupBrewPack } from "../utils/setup/setupBrewPack"
import { setupChocoPack } from "../utils/setup/setupChocoPack" import { setupChocoPack } from "../utils/setup/setupChocoPack"
@ -12,11 +13,11 @@ export async function setupGcc(version: string, _setupCppDir: string, arch: stri
} }
await setupChocoPack("mingw", version) await setupChocoPack("mingw", version)
let binDir: string | undefined let binDir: string | undefined
if (arch === "x64") { if (arch === "x64" && existsSync("C:\\tools\\mingw64\\bin")) {
binDir = "C:\\tools\\mingw64\\bin" binDir = "C:\\tools\\mingw64\\bin"
addPath(binDir) addPath(binDir)
return { binDir } return { binDir }
} else if (arch === "ia32") { } else if (arch === "ia32" && existsSync("C:\\tools\\mingw32\\bin")) {
binDir = "C:\\tools\\mingw32\\bin" binDir = "C:\\tools\\mingw32\\bin"
addPath(binDir) addPath(binDir)
return { binDir } return { binDir }