Merge pull request #257 from aminya/vcpkg-version

Author: aminya

.gitignore

@@ -17,3 +17,5 @@ exe/
 *.log
 *.exe
 .cache/
+
+coverage

biome.jsonc

@@ -7,7 +7,8 @@
             "**/dist/**",
             "dev/cpp_vcpkg_project/**/*",
             "**/.venv/",
-            "**/.*cache/"
+            "**/.*cache/",
+            "**/coverage/"
         ],
         "ignoreUnknown": true
     },

dist/actions/setup-cpp.js

@@ -23,13 +23,15 @@ export async function setupLLVM(version: string, setupDir: string, arch: string)
 }
 
 async function setupLLVMWithoutActivation_raw(version: string, setupDir: string, arch: string) {
-  // install LLVM and its dependencies in parallel
-  const [installationInfo, _1, _2] = await Promise.all([
+  // install LLVM
+  const [installationInfo, _1] = await Promise.all([
     setupLLVMOnly(version, setupDir, arch),
-    setupLLVMDeps(arch),
     addLLVMLoggingMatcher(),
   ])
 
+  // install LLVM dependencies
+  await setupLLVMDeps(arch)
+
   return installationInfo
 }
 const setupLLVMWithoutActivation = memoize(setupLLVMWithoutActivation_raw, { isPromise: true })

dist/actions/setup-cpp.js.map

@@ -4,7 +4,7 @@ import { execa } from "execa"
 import { chmod, readFile, writeFile } from "fs/promises"
 import { DEFAULT_TIMEOUT } from "../installTool"
 import { addPath } from "../utils/env/addEnv"
-import { hasNala, isPackageRegexInstalled, setupAptPack } from "../utils/setup/setupAptPack"
+import { aptTimeout, hasNala, isPackageRegexInstalled, setupAptPack } from "../utils/setup/setupAptPack"
 import type { InstallationInfo } from "../utils/setup/setupBin"
 
 export enum LLVMPackages {
@@ -70,16 +70,16 @@ function nonInteractiveScript(script: string) {
   // make the scirpt non-interactive and fix broken packages
   return script.replace(
     /add-apt-repository "\${REPO_NAME}"/g,
-    // eslint-disable-next-line no-template-curly-in-string
-    "add-apt-repository -y \"${REPO_NAME}\"",
+    `add-apt-repository -y -n "\${REPO_NAME}"
+apt-get update -o ${aptTimeout} -y`,
   )
 }
 
 async function removeConflictingPackages(givenScript: string) {
   // fix conflicts between libclang-rt and libclang
   let script = givenScript.replace(
     /apt-get install -y/g,
-    "apt-get install -o Dpkg::Options::=\"--force-overwrite\" -y --fix-broken",
+    `apt-get install -o Dpkg::Options::="--force-overwrite" -o ${aptTimeout}  -y --fix-broken`,
   )
 
   // check if these are installed and if so, remove them from the script as they conflict