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

Merge pull request #202 from aminya/clang-format-version [skip ci]

This commit is contained in:
Amin Yahyaabadi 2023-09-11 09:46:05 -07:00 committed by GitHub
parent 15f7626551 17286fce04
commit 0cf6799b89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/actions/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/actions/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/legacy/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/legacy/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/setup-cpp.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/modern/setup-cpp.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
src/llvm/llvm_installer.ts
View File

@ -23,7 +23,7 @@ export async function setupLLVMApt(
await setupAptPack([{ name: "curl" }]) await setupAptPack([{ name: "curl" }])
await execa("curl", ["-LJO", "https://apt.llvm.org/llvm.sh"], { cwd: "/tmp" }) await execa("curl", ["-LJO", "https://apt.llvm.org/llvm.sh"], { cwd: "/tmp" })
const neededPackages = await patchAptLLVMScript("/tmp/llvm.sh", "/tmp/llvm-setup-cpp.sh", packages) const neededPackages = await patchAptLLVMScript("/tmp/llvm.sh", "/tmp/llvm-setup-cpp.sh", majorVersion, packages)
await setupAptPack(neededPackages) await setupAptPack(neededPackages)
await chmod("/tmp/llvm-setup-cpp.sh", "755") await chmod("/tmp/llvm-setup-cpp.sh", "755")
await execRoot( await execRoot(
@ -45,12 +45,12 @@ export async function setupLLVMApt(
} }
} }
async function patchAptLLVMScript(path: string, target_path: string, packages: LLVMPackages) { async function patchAptLLVMScript(path: string, target_path: string, majorVersion: number, packages: LLVMPackages) {
let script = await readFile(path, "utf-8") let script = await readFile(path, "utf-8")
script = debugScript(script) script = debugScript(script)
script = nonInteractiveScript(script) script = nonInteractiveScript(script)
script = choosePackages(packages, script) script = choosePackages(packages, script, majorVersion)
script = await removeConflictingPackages(script) script = await removeConflictingPackages(script)
script = useNalaScript(script) script = useNalaScript(script)
@ -105,9 +105,9 @@ function useNalaScript(script: string) {
return script return script
} }
function choosePackages(packages: LLVMPackages, script: string) { function choosePackages(packages: LLVMPackages, script: string, majorVersion: number) {
if (packages === LLVMPackages.ClangFormat) { if (packages === LLVMPackages.ClangFormat) {
return script.replace(/ -y \$PKG/g, " -y clang-format") return script.replace(/ -y \$PKG/g, ` -y clang-format-${majorVersion}`)
} }
return script return script
} }