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

feat: skip msvc installation if already installed

This commit is contained in:
Amin Yahyaabadi 2021-12-06 09:24:48 -06:00
parent 19e817130b
commit 81665645c1
3 changed files with 21 additions and 6 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

23
src/msvc/msvc.ts
View File

@ -3,7 +3,7 @@ import { error } from "@actions/core"
import { setupVCVarsall } from "../vcvarsall/vcvarsall" import { setupVCVarsall } from "../vcvarsall/vcvarsall"
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
import { vsversion_to_versionnumber } from "msvc-dev-cmd/lib.js" import { vsversion_to_versionnumber, findVcvarsall } from "msvc-dev-cmd/lib.js"
type MSVCVersion = "2022" | "17.0" | "2019" | "16.0" | "2017" | "15.0" | "2015" | "14.0" | "2013" | "12.0" | string type MSVCVersion = "2022" | "17.0" | "2019" | "16.0" | "2017" | "15.0" | "2015" | "14.0" | "2013" | "12.0" | string
@ -20,21 +20,36 @@ export async function setupMSVC(
} }
const version = vsversion_to_versionnumber(versionGiven) as string const version = vsversion_to_versionnumber(versionGiven) as string
// check if the given version is already installed
let installed = false
try {
findVcvarsall(version)
installed = true
} catch {
// not installed, try installing
}
let toolset: string | undefined let toolset: string | undefined
let VCTargetsPath: string | undefined let VCTargetsPath: string | undefined
// https://github.com/aminya/setup-cpp/issues/1 // https://github.com/aminya/setup-cpp/issues/1
try { try {
if (version === "14.0") { if (version === "14.0") {
toolset = "14.0" toolset = "14.0"
await setupChocoPack("visualcpp-build-tools", "14.0.25420.1", ["--ignore-dependencies"]) if (!installed) {
await setupChocoPack("visualcpp-build-tools", "14.0.25420.1", ["--ignore-dependencies"])
}
VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140" VCTargetsPath = "C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140"
} else if (version === "15.0") { } else if (version === "15.0") {
toolset = "14.16" toolset = "14.16"
await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", []) if (!installed) {
await setupChocoPack("visualstudio2017buildtools", "15.9.41.0", [])
}
VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path VCTargetsPath = "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Tools/MSVC/14.16" // TODO verify path
} else if (version === "16.0") { } else if (version === "16.0") {
toolset = "14.29" toolset = "14.29"
await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", []) if (!installed) {
await setupChocoPack("visualstudio2019buildtools", "16.11.7.0", [])
}
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"
} else { } else {
error(`The given MSVC versions ${versionGiven} is not supported yet.`) error(`The given MSVC versions ${versionGiven} is not supported yet.`)