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

aminya · Sep 11, 2023 · 0cf6799 · 0cf6799
2 parents 15f7626 + 17286fc
commit 0cf6799
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/dist/actions/setup-cpp.js b/dist/actions/setup-cpp.js
diff --git a/dist/actions/setup-cpp.js.map b/dist/actions/setup-cpp.js.map
diff --git a/dist/legacy/setup-cpp.js b/dist/legacy/setup-cpp.js
diff --git a/dist/legacy/setup-cpp.js.map b/dist/legacy/setup-cpp.js.map
diff --git a/dist/modern/setup-cpp.js b/dist/modern/setup-cpp.js
diff --git a/dist/modern/setup-cpp.js.map b/dist/modern/setup-cpp.js.map
diff --git a/src/llvm/llvm_installer.ts b/src/llvm/llvm_installer.ts
@@ -23,7 +23,7 @@ export async function setupLLVMApt(
 
   await setupAptPack([{ name: "curl" }])
   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 chmod("/tmp/llvm-setup-cpp.sh", "755")
   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")
 
   script = debugScript(script)
   script = nonInteractiveScript(script)
-  script = choosePackages(packages, script)
+  script = choosePackages(packages, script, majorVersion)
   script = await removeConflictingPackages(script)
   script = useNalaScript(script)
 
@@ -105,9 +105,9 @@ function useNalaScript(script: string) {
   return script
 }
 
-function choosePackages(packages: LLVMPackages, script: string) {
+function choosePackages(packages: LLVMPackages, script: string, majorVersion: number) {
   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
 }