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

fix: ignore path modification error for MSVC

This commit is contained in:
Amin Yahyaabadi 2021-12-06 05:54:37 -06:00
parent 7092c4b51f
commit 487a88259f
4 changed files with 11 additions and 7 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

11
src/msvc/msvc.ts
View File

@ -1,7 +1,6 @@
import { setupChocoPack } from "../utils/setup/setupChocoPack" import { setupChocoPack } from "../utils/setup/setupChocoPack"
import { error } from "@actions/core" import { error } from "@actions/core"
import { setupVCVarsall } from "../vcvarsall/vcvarsall" import { setupVCVarsall } from "../vcvarsall/vcvarsall"
import { readFileSync } from "fs"
type MSVCVersion = "2015" | "2017" | "2019" | string type MSVCVersion = "2015" | "2017" | "2019" | string
@ -35,9 +34,13 @@ export async function setupMSVC(
VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133" VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Tools/MSVC/14.29.30133"
} }
} catch (e) { } catch (e) {
error(e as string | Error) if (
const choco_logs = readFileSync(`${process.env.ALLUSERSPROFILE}\\chocolatey\\logs\\chocolatey.log`, "utf8") !(e as string | Error)
console.log(choco_logs) .toString()
.includes("Item has already been added. Key in dictionary: 'Path' Key being added: 'PATH'")
) {
error(e as string | Error)
}
} }
// run vcvarsall.bat environment variables // run vcvarsall.bat environment variables
setupVCVarsall(VCTargetsPath, arch, toolset, sdk, uwp, spectre) setupVCVarsall(VCTargetsPath, arch, toolset, sdk, uwp, spectre)

3
src/vcvarsall/vcvarsall.ts
View File

@ -1,4 +1,4 @@
import { exportVariable } from "@actions/core" import { exportVariable, info } from "@actions/core"
import { existsSync } from "fs" import { existsSync } from "fs"
function getArch(arch: string): string { function getArch(arch: string): string {
@ -26,6 +26,7 @@ export function setupVCVarsall(
spectre?: boolean spectre?: boolean
) { ) {
if (VCTargetsPath !== undefined && existsSync(VCTargetsPath)) { if (VCTargetsPath !== undefined && existsSync(VCTargetsPath)) {
info(`Adding ${VCTargetsPath} to PATH`)
exportVariable("VCTargetsPath", VCTargetsPath) exportVariable("VCTargetsPath", VCTargetsPath)
} }