mirror of https://github.com/aminya/setup-cpp
chore: fix linting errors
This commit is contained in:
parent
fb48106188
commit
7ccf39eac3
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -60,8 +60,12 @@ export async function installCompiler(
|
||||||
case "mingw":
|
case "mingw":
|
||||||
case "cygwin":
|
case "cygwin":
|
||||||
case "msys": {
|
case "msys": {
|
||||||
const gccVersion = (compiler === "mingw")? getVersion("mingw", version, osVersion) : getVersion("gcc", version, osVersion)
|
const gccVersion =
|
||||||
const installationInfo = (compiler === "mingw")? await setupMingw(gccVersion, join(setupCppDir, "gcc"), arch) : await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch)
|
compiler === "mingw" ? getVersion("mingw", version, osVersion) : getVersion("gcc", version, osVersion)
|
||||||
|
const installationInfo =
|
||||||
|
compiler === "mingw"
|
||||||
|
? await setupMingw(gccVersion, join(setupCppDir, "gcc"), arch)
|
||||||
|
: await setupGcc(gccVersion, join(setupCppDir, "gcc"), arch)
|
||||||
|
|
||||||
if (hasLLVM) {
|
if (hasLLVM) {
|
||||||
// remove back the added CPPFLAGS of LLVM that include the LLVM headers
|
// remove back the added CPPFLAGS of LLVM that include the LLVM headers
|
||||||
|
|
|
@ -153,9 +153,7 @@ export async function setupMingw(version: string, setupDir: string, arch: string
|
||||||
if (isArch()) {
|
if (isArch()) {
|
||||||
installationInfo = await setupPacmanPack("mingw-w64-gcc", version)
|
installationInfo = await setupPacmanPack("mingw-w64-gcc", version)
|
||||||
} else if (hasDnf()) {
|
} else if (hasDnf()) {
|
||||||
installationInfo = await setupDnfPack([
|
installationInfo = await setupDnfPack([{ name: "mingw64-gcc", version }])
|
||||||
{ name: "mingw64-gcc", version },
|
|
||||||
])
|
|
||||||
} else if (isUbuntu()) {
|
} else if (isUbuntu()) {
|
||||||
installationInfo = await setupAptPack([
|
installationInfo = await setupAptPack([
|
||||||
{ name: "mingw-w64", version, repositories: ["ppa:ubuntu-toolchain-r/test"] },
|
{ name: "mingw-w64", version, repositories: ["ppa:ubuntu-toolchain-r/test"] },
|
||||||
|
|
|
@ -137,4 +137,4 @@ main(process.argv)
|
||||||
error("main() panicked!")
|
error("main() panicked!")
|
||||||
error(err as string | Error)
|
error(err as string | Error)
|
||||||
process.exitCode = 1
|
process.exitCode = 1
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue