mirror of https://github.com/aminya/setup-cpp
fix: choose clang-format before other patches
This commit is contained in:
parent
9e5af3bc58
commit
d3a4b94794
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
|
@ -50,9 +50,9 @@ async function patchAptLLVMScript(path: string, target_path: string, packages: L
|
||||||
|
|
||||||
script = debugScript(script)
|
script = debugScript(script)
|
||||||
script = nonInteractiveScript(script)
|
script = nonInteractiveScript(script)
|
||||||
script = await removeConflictingPAckages(script)
|
|
||||||
script = useNalaScript(script)
|
|
||||||
script = choosePackages(packages, script)
|
script = choosePackages(packages, script)
|
||||||
|
script = await removeConflictingPackages(script)
|
||||||
|
script = useNalaScript(script)
|
||||||
|
|
||||||
await writeFile(target_path, script)
|
await writeFile(target_path, script)
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ function nonInteractiveScript(script: string) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
async function removeConflictingPAckages(givenScript: string) {
|
async function removeConflictingPackages(givenScript: string) {
|
||||||
// fix conflicts between libclang-rt and libclang
|
// fix conflicts between libclang-rt and libclang
|
||||||
let script = givenScript.replace(
|
let script = givenScript.replace(
|
||||||
/apt-get install -y/g,
|
/apt-get install -y/g,
|
||||||
|
|
Loading…
Reference in New Issue